Merge pull request psf#2485 from sigmavirus24/bug/shazow/urllib3/567

Import urllib3's Retry location from the right place
kennethreitz · Mar 12, 2015 · bc746e1 · bc746e1
2 parents 9adaae6 + c4bd6ea
commit bc746e1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/requests/adapters.py b/requests/adapters.py
@@ -11,10 +11,10 @@
 import socket
 
 from .models import Response
-from .packages.urllib3 import Retry
 from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
 from .packages.urllib3.response import HTTPResponse
 from .packages.urllib3.util import Timeout as TimeoutSauce
+from .packages.urllib3.util.retry import Retry
 from .compat import urlparse, basestring
 from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
                     prepend_scheme_if_needed, get_auth_from_url, urldefragauth)