diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2014-09-22 22:42:56 +0000 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2014-09-22 22:42:56 +0000 |
| commit | 3419e57bfd45d703aa41f782fee9546499bf2cb8 (patch) | |
| tree | f33796163e2256a48323bbb116d90747111e6371 /debian/patches | |
| parent | 4724d7ca7e4d98ed76175141d9658a93b211339e (diff) | |
| download | python-urllib3-3419e57bfd45d703aa41f782fee9546499bf2cb8.tar python-urllib3-3419e57bfd45d703aa41f782fee9546499bf2cb8.tar.gz | |
Refresh debian/patches/01_do-not-use-embedded-python-six.patch
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/01_do-not-use-embedded-python-six.patch | 14 |
1 files changed, 7 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..01debc0 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 @@ |