2c9580b
From 75f027ac8bc55ad280f7bf72a25db1ce8c1fc76d Mon Sep 17 00:00:00 2001
2c9580b
From: Jeremy Cline <jeremy@jcline.org>
2c9580b
Date: Mon, 19 Jun 2017 16:19:53 -0400
2c9580b
Subject: [PATCH] Don't import OrderedDict from urllib3
2c9580b
2c9580b
Signed-off-by: Jeremy Cline <jeremy@jcline.org>
2c9580b
---
2c9580b
 requests/compat.py | 5 ++++-
2c9580b
 1 file changed, 4 insertions(+), 1 deletion(-)
2c9580b
2c9580b
diff --git a/requests/compat.py b/requests/compat.py
2c9580b
index 5c09ea8..61fa0c8 100644
2c9580b
--- a/requests/compat.py
2c9580b
+++ b/requests/compat.py
2c9580b
@@ -46,7 +46,10 @@ if is_py2:
2c9580b
     from Cookie import Morsel
2c9580b
     from StringIO import StringIO
2c9580b
 
2c9580b
-    from urllib3.packages.ordered_dict import OrderedDict
2c9580b
+    try:
2c9580b
+        from collections import OrderedDict  # py2.7+
2c9580b
+    except:
2c9580b
+        from ordereddict import OrderedDict  # py2.6 and lower (el6, etc.
2c9580b
 
2c9580b
     builtin_str = str
2c9580b
     bytes = str
2c9580b
-- 
2c9580b
2.9.4
2c9580b