diff options
| author | SVN-Git Migration <python-modules-team@lists.alioth.debian.org> | 2015-10-08 13:41:26 -0700 |
|---|---|---|
| committer | SVN-Git Migration <python-modules-team@lists.alioth.debian.org> | 2015-10-08 13:41:26 -0700 |
| commit | c6ee35e00c5709435b3a6b664c44fceb70a918c6 (patch) | |
| tree | 816307f3c7e1c80f1dd49d617e480e95198d9c18 /requests/packages/charade/compat.py | |
| parent | 9f376f89bdf80a40914218d64cd9cd61b25f449d (diff) | |
| download | python-requests-c6ee35e00c5709435b3a6b664c44fceb70a918c6.tar python-requests-c6ee35e00c5709435b3a6b664c44fceb70a918c6.tar.gz | |
Imported Upstream version 1.2.0
Diffstat (limited to 'requests/packages/charade/compat.py')
| -rw-r--r-- | requests/packages/charade/compat.py | 12 |
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 |