]>
Commit | Line | Data |
---|---|---|
017795a9 JB |
1 | From 8c2259d4ab03ef982738aaf863068a1015cadf3d Mon Sep 17 00:00:00 2001 |
2 | From: Ralph Bean <rbean@redhat.com> | |
3 | Date: Wed, 5 Nov 2014 10:23:44 -0500 | |
4 | Subject: [PATCH] Remove nested bundling dep. | |
5 | ||
6 | --- | |
7 | requests/compat.py | 6 +++++- | |
8 | 1 file changed, 5 insertions(+), 1 deletion(-) | |
9 | ||
10 | diff --git a/requests/compat.py b/requests/compat.py | |
11 | index be5a1ed..70ea4e8 100644 | |
12 | --- a/requests/compat.py | |
13 | +++ b/requests/compat.py | |
14 | @@ -91,7 +91,11 @@ if is_py2: | |
15 | import cookielib | |
16 | from Cookie import Morsel | |
17 | from StringIO import StringIO | |
18 | - from .packages.urllib3.packages.ordered_dict import OrderedDict | |
19 | + | |
20 | + try: | |
21 | + from collections import OrderedDict # py2.7 | |
22 | + except: | |
23 | + from ordereddict import OrderedDict # py2.6 and lower (el6, etc.) | |
24 | ||
25 | builtin_str = str | |
26 | bytes = str | |
27 | -- | |
28 | 1.9.3 | |
29 |