29 lines
811 B
Diff
29 lines
811 B
Diff
From 152550287d6538e5cc7649bcf685a5a0b35058dd Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Cline <jcline@redhat.com>
|
|
Date: Tue, 12 Jun 2018 14:06:00 -0400
|
|
Subject: [PATCH] Don't import OrderedDict from urllib3
|
|
|
|
We unbundle urllib3, just use collections (py2.7+)
|
|
|
|
Signed-off-by: Jeremy Cline <jcline@redhat.com>
|
|
---
|
|
requests/compat.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/requests/compat.py b/requests/compat.py
|
|
index 6b9c6fac..6ba6e460 100644
|
|
--- a/requests/compat.py
|
|
+++ b/requests/compat.py
|
|
@@ -45,7 +45,7 @@ if is_py2:
|
|
from StringIO import StringIO
|
|
from collections import Callable, Mapping, MutableMapping
|
|
|
|
- from urllib3.packages.ordered_dict import OrderedDict
|
|
+ from collections import OrderedDict # py2.7+
|
|
|
|
builtin_str = str
|
|
bytes = str
|
|
--
|
|
2.17.1
|
|
|