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 | 28 |
1 files changed, 15 insertions, 13 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 24710dd..363e772 100644 --- a/debian/patches/01_do-not-use-embedded-python-six.patch +++ b/debian/patches/01_do-not-use-embedded-python-six.patch @@ -1,4 +1,4 @@ -From e720aa3dea81bf5c30d9a897f9cbae18bf6a4228 Mon Sep 17 00:00:00 2001 +From 3a7deaa269ec9e1dc5dfb860e29b053475647cf5 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli <eriol@mornie.org> Date: Thu, 8 Oct 2015 13:19:46 -0700 Subject: Do not use embedded copy of python-six. @@ -20,16 +20,16 @@ Patch-Name: 01_do-not-use-embedded-python-six.patch urllib3/connectionpool.py | 2 +- urllib3/fields.py | 2 +- urllib3/filepost.py | 4 ++-- - urllib3/response.py | 2 +- + urllib3/response.py | 4 ++-- urllib3/util/request.py | 2 +- urllib3/util/retry.py | 2 +- - 15 files changed, 16 insertions(+), 16 deletions(-) + 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dummyserver/handlers.py b/dummyserver/handlers.py -index ffa1dd3..1ee4dd7 100644 +index 43398cd..a7828a3 100644 --- a/dummyserver/handlers.py +++ b/dummyserver/handlers.py -@@ -261,7 +261,7 @@ def _parse_header(line): +@@ -263,7 +263,7 @@ def _parse_header(line): """ import tornado.httputil import email.utils @@ -39,7 +39,7 @@ index ffa1dd3..1ee4dd7 100644 line = line.encode('utf-8') parts = tornado.httputil._parseparam(';' + line) diff --git a/test/__init__.py b/test/__init__.py -index 172493c..7ea6358 100644 +index f7c4a7a..22d3616 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -8,7 +8,7 @@ import socket @@ -128,12 +128,12 @@ index b68b9a5..af8074a 100644 __all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict'] diff --git a/urllib3/connection.py b/urllib3/connection.py -index f64dd1a..a2b8fcb 100644 +index 3eab1e2..115eac9 100644 --- a/urllib3/connection.py +++ b/urllib3/connection.py @@ -3,7 +3,7 @@ import sys import socket - from socket import timeout as SocketTimeout + from socket import error as SocketError, timeout as SocketTimeout import warnings -from .packages import six +import six @@ -141,11 +141,11 @@ index f64dd1a..a2b8fcb 100644 try: # Python 3 from http.client import HTTPConnection as _HTTPConnection, HTTPException diff --git a/urllib3/connectionpool.py b/urllib3/connectionpool.py -index c958725..0750e24 100644 +index b38ac68..563f108 100644 --- a/urllib3/connectionpool.py +++ b/urllib3/connectionpool.py -@@ -28,7 +28,7 @@ from .exceptions import ( - InsecureRequestWarning, +@@ -30,7 +30,7 @@ from .exceptions import ( + NewConnectionError, ) from .packages.ssl_match_hostname import CertificateError -from .packages import six @@ -182,15 +182,17 @@ index 0fbf488..97ab970 100644 writer = codecs.lookup('utf-8')[3] diff --git a/urllib3/response.py b/urllib3/response.py -index 15d4aac..64273db 100644 +index 788eb6c..c41bd2c 100644 --- a/urllib3/response.py +++ b/urllib3/response.py -@@ -11,7 +11,7 @@ from ._collections import HTTPHeaderDict +@@ -7,8 +7,8 @@ from ._collections import HTTPHeaderDict from .exceptions import ( ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked ) -from .packages.six import string_types as basestring, binary_type, PY3 +-from .packages.six.moves import http_client as httplib +from six import string_types as basestring, binary_type, PY3 ++from six.moves import http_client as httplib from .connection import HTTPException, BaseSSLError from .util.response import is_fp_closed, is_response_to_head |