projects
/
services
/
python-requests.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f1ba27f
)
Import basestring.
author
Cory Benfield
<lukasaoz@gmail.com>
Wed, 19 Dec 2012 21:37:47 +0000
(21:37 +0000)
committer
Cory Benfield
<lukasaoz@gmail.com>
Wed, 19 Dec 2012 21:37:47 +0000
(21:37 +0000)
requests/adapters.py
patch
|
blob
|
history
diff --git
a/requests/adapters.py
b/requests/adapters.py
index
383ea9a
..
44e0786
100644
(file)
--- a/
requests/adapters.py
+++ b/
requests/adapters.py
@@
-13,7
+13,7
@@
import socket
from .models import Response
from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
from .hooks import dispatch_hook
-from .compat import urlparse
+from .compat import urlparse
, basestring
from .utils import DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers
from .structures import CaseInsensitiveDict
from .packages.urllib3.exceptions import MaxRetryError