diff options
Diffstat (limited to 'debian/patches/01_do-not-use-embedded-python-six.patch')
| -rw-r--r-- | debian/patches/01_do-not-use-embedded-python-six.patch | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/debian/patches/01_do-not-use-embedded-python-six.patch b/debian/patches/01_do-not-use-embedded-python-six.patch index 0774786..a7a0716 100644 --- a/debian/patches/01_do-not-use-embedded-python-six.patch +++ b/debian/patches/01_do-not-use-embedded-python-six.patch @@ -1,7 +1,7 @@ Description: Do not use embedded copy of python-six. Author: Daniele Tricoli <eriol@mornie.org> Forwarded: not-needed -Last-Update: 2014-09-01 +Last-Update: 2014-09-23 --- a/test/test_collections.py +++ b/test/test_collections.py @@ -106,15 +106,15 @@ Last-Update: 2014-09-01 __all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict'] --- a/urllib3/connection.py +++ b/urllib3/connection.py -@@ -28,7 +28,7 @@ - ConnectTimeoutError, - ) - from .packages.ssl_match_hostname import match_hostname +@@ -3,7 +3,7 @@ + import socket + from socket import timeout as SocketTimeout + import warnings -from .packages import six +import six - from .util.ssl_ import ( - resolve_cert_reqs, + try: # Python 3 + from http.client import HTTPConnection as _HTTPConnection, HTTPException --- a/urllib3/util/request.py +++ b/urllib3/util/request.py @@ -1,6 +1,6 @@ @@ -146,3 +146,23 @@ Last-Update: 2014-09-01 from urllib3.util.retry import Retry from urllib3.exceptions import ( ConnectTimeoutError, +--- a/test/__init__.py ++++ b/test/__init__.py +@@ -7,7 +7,7 @@ + from nose.plugins.skip import SkipTest + + from urllib3.exceptions import MaxRetryError, HTTPWarning +-from urllib3.packages import six ++import six + + # We need a host that will not immediately close the connection with a TCP + # Reset. SO suggests this hostname +--- a/test/contrib/test_pyopenssl.py ++++ b/test/contrib/test_pyopenssl.py +@@ -1,5 +1,5 @@ + from nose.plugins.skip import SkipTest +-from urllib3.packages import six ++import six + + if six.PY3: + raise SkipTest('Testing of PyOpenSSL disabled on PY3') |