From e75853fc04102c7f72f2e955b63f9692c472f64a Mon Sep 17 00:00:00 2001
From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
Date: Thu, 8 Oct 2015 13:41:21 -0700
Subject: Imported Upstream version 0.10.8

---
 requests/compat.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'requests/compat.py')

diff --git a/requests/compat.py b/requests/compat.py
index 224bfd0..fec7a01 100644
--- a/requests/compat.py
+++ b/requests/compat.py
@@ -86,8 +86,10 @@ if is_py2:
     from .packages.oreos.monkeys import SimpleCookie
     from StringIO import StringIO
 
-    str = unicode
     bytes = str
+    str = unicode
+    basestring = basestring
+
 
 
 elif is_py3:
@@ -99,4 +101,5 @@ elif is_py3:
 
     str = str
     bytes = bytes
+    basestring = (str,bytes)
 
-- 
cgit v1.2.3