summaryrefslogtreecommitdiff
path: root/requests/compat.py
diff options
context:
space:
mode:
authorIan Cordasco <graffatcolmingov@gmail.com>2012-09-02 23:09:43 -0400
committerIan Cordasco <graffatcolmingov@gmail.com>2012-09-02 23:10:28 -0400
commit8081d7b15cf893435c19ea1c0d5e4392a60fe18f (patch)
tree7ad48e01815c150dc991522de75f6e391ed88055 /requests/compat.py
parentc8f166f696327dc8ec07a248863fcc35fafa2038 (diff)
downloadpython-requests-8081d7b15cf893435c19ea1c0d5e4392a60fe18f.tar.gz
Fixes #817.
Use dicts and lists where necessary but accept both dicts and lists of 2-tuples everywhere.
Diffstat (limited to 'requests/compat.py')
-rw-r--r--requests/compat.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/requests/compat.py b/requests/compat.py
index 1d4f4a92..351b7c6e 100644
--- a/requests/compat.py
+++ b/requests/compat.py
@@ -93,6 +93,7 @@ if is_py2:
import cchardet as chardet
except ImportError:
from .packages import chardet
+ from .packages.urllib3.packages.ordered_dict import OrderedDict
builtin_str = str
bytes = str
@@ -109,6 +110,7 @@ elif is_py3:
from http.cookies import Morsel
from io import StringIO
from .packages import chardet2 as chardet
+ from collections import OrderedDict
builtin_str = str
str = str