aboutsummaryrefslogtreecommitdiff
path: root/requests/packages/charade/compat.py
diff options
context:
space:
mode:
Diffstat (limited to 'requests/packages/charade/compat.py')
-rw-r--r--requests/packages/charade/compat.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/requests/packages/charade/compat.py b/requests/packages/charade/compat.py
index f86c46b..d9e30ad 100644
--- a/requests/packages/charade/compat.py
+++ b/requests/packages/charade/compat.py
@@ -18,9 +18,17 @@
# 02110-1301 USA
######################### END LICENSE BLOCK #########################
+import sys
+
+
+if sys.version_info < (3, 0):
+ base_str = (str, unicode)
+else:
+ base_str = (bytes, str)
+
def wrap_ord(a):
- if isinstance(a, str):
+ if sys.version_info < (3, 0) and isinstance(a, base_str):
return ord(a)
- elif isinstance(a, int):
+ else:
return a