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 | 252 |
1 files changed, 152 insertions, 100 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 9f4c025..24710dd 100644 --- a/debian/patches/01_do-not-use-embedded-python-six.patch +++ b/debian/patches/01_do-not-use-embedded-python-six.patch @@ -1,11 +1,72 @@ -Description: Do not use embedded copy of python-six. -Author: Daniele Tricoli <eriol@mornie.org> +From e720aa3dea81bf5c30d9a897f9cbae18bf6a4228 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. + Forwarded: not-needed Last-Update: 2015-05-03 +Patch-Name: 01_do-not-use-embedded-python-six.patch +--- + dummyserver/handlers.py | 2 +- + test/__init__.py | 2 +- + test/contrib/test_pyopenssl.py | 2 +- + test/test_collections.py | 2 +- + test/test_fields.py | 2 +- + test/test_filepost.py | 2 +- + test/test_retry.py | 2 +- + urllib3/_collections.py | 2 +- + urllib3/connection.py | 2 +- + urllib3/connectionpool.py | 2 +- + urllib3/fields.py | 2 +- + urllib3/filepost.py | 4 ++-- + urllib3/response.py | 2 +- + urllib3/util/request.py | 2 +- + urllib3/util/retry.py | 2 +- + 15 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/dummyserver/handlers.py b/dummyserver/handlers.py +index ffa1dd3..1ee4dd7 100644 +--- a/dummyserver/handlers.py ++++ b/dummyserver/handlers.py +@@ -261,7 +261,7 @@ def _parse_header(line): + """ + import tornado.httputil + import email.utils +- from urllib3.packages import six ++ import six + if not six.PY3: + line = line.encode('utf-8') + parts = tornado.httputil._parseparam(';' + line) +diff --git a/test/__init__.py b/test/__init__.py +index 172493c..7ea6358 100644 +--- a/test/__init__.py ++++ b/test/__init__.py +@@ -8,7 +8,7 @@ import socket + 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 +diff --git a/test/contrib/test_pyopenssl.py b/test/contrib/test_pyopenssl.py +index 5d57527..f23ff19 100644 +--- 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') +diff --git a/test/test_collections.py b/test/test_collections.py +index 9d72939..78ef634 100644 --- a/test/test_collections.py +++ b/test/test_collections.py -@@ -4,7 +4,7 @@ +@@ -4,7 +4,7 @@ from urllib3._collections import ( HTTPHeaderDict, RecentlyUsedContainer as Container ) @@ -14,44 +75,24 @@ Last-Update: 2015-05-03 xrange = six.moves.xrange from nose.plugins.skip import SkipTest ---- a/urllib3/connectionpool.py -+++ b/urllib3/connectionpool.py -@@ -28,7 +28,7 @@ - InsecureRequestWarning, - ) - from .packages.ssl_match_hostname import CertificateError --from .packages import six -+import six - from .connection import ( - port_by_scheme, - DummyConnection, ---- a/urllib3/filepost.py -+++ b/urllib3/filepost.py -@@ -3,8 +3,8 @@ - from uuid import uuid4 - from io import BytesIO +diff --git a/test/test_fields.py b/test/test_fields.py +index cdec68b..66da148 100644 +--- a/test/test_fields.py ++++ b/test/test_fields.py +@@ -1,7 +1,7 @@ + import unittest --from .packages import six --from .packages.six import b -+import six -+from six import b - from .fields import RequestField + from urllib3.fields import guess_content_type, RequestField +-from urllib3.packages.six import u ++from six import u - writer = codecs.lookup('utf-8')[3] ---- a/urllib3/response.py -+++ b/urllib3/response.py -@@ -11,7 +11,7 @@ - from .exceptions import ( - ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked - ) --from .packages.six import string_types as basestring, binary_type, PY3 -+from six import string_types as basestring, binary_type, PY3 - from .connection import HTTPException, BaseSSLError - from .util.response import is_fp_closed, is_response_to_head + class TestRequestField(unittest.TestCase): +diff --git a/test/test_filepost.py b/test/test_filepost.py +index 390dbb3..ecc6710 100644 --- a/test/test_filepost.py +++ b/test/test_filepost.py -@@ -2,7 +2,7 @@ +@@ -2,7 +2,7 @@ import unittest from urllib3.filepost import encode_multipart_formdata, iter_fields from urllib3.fields import RequestField @@ -60,42 +101,24 @@ Last-Update: 2015-05-03 BOUNDARY = '!! test boundary !!' ---- a/dummyserver/handlers.py -+++ b/dummyserver/handlers.py -@@ -261,7 +261,7 @@ - """ - import tornado.httputil - import email.utils -- from urllib3.packages import six -+ import six - if not six.PY3: - line = line.encode('utf-8') - parts = tornado.httputil._parseparam(';' + line) ---- a/urllib3/fields.py -+++ b/urllib3/fields.py -@@ -1,7 +1,7 @@ - import email.utils - import mimetypes - --from .packages import six -+import six - - - def guess_content_type(filename, default='application/octet-stream'): ---- a/test/test_fields.py -+++ b/test/test_fields.py +diff --git a/test/test_retry.py b/test/test_retry.py +index 421e508..8fcc287 100644 +--- a/test/test_retry.py ++++ b/test/test_retry.py @@ -1,7 +1,7 @@ import unittest - from urllib3.fields import guess_content_type, RequestField --from urllib3.packages.six import u -+from six import u - - - class TestRequestField(unittest.TestCase): + from urllib3.response import HTTPResponse +-from urllib3.packages.six.moves import xrange ++from six.moves import xrange + from urllib3.util.retry import Retry + from urllib3.exceptions import ( + ConnectTimeoutError, +diff --git a/urllib3/_collections.py b/urllib3/_collections.py +index b68b9a5..af8074a 100644 --- a/urllib3/_collections.py +++ b/urllib3/_collections.py -@@ -14,7 +14,7 @@ +@@ -14,7 +14,7 @@ try: # Python 2.7+ from collections import OrderedDict except ImportError: from .packages.ordered_dict import OrderedDict @@ -104,9 +127,11 @@ Last-Update: 2015-05-03 __all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict'] +diff --git a/urllib3/connection.py b/urllib3/connection.py +index f64dd1a..a2b8fcb 100644 --- a/urllib3/connection.py +++ b/urllib3/connection.py -@@ -3,7 +3,7 @@ +@@ -3,7 +3,7 @@ import sys import socket from socket import timeout as SocketTimeout import warnings @@ -115,6 +140,62 @@ Last-Update: 2015-05-03 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 +--- a/urllib3/connectionpool.py ++++ b/urllib3/connectionpool.py +@@ -28,7 +28,7 @@ from .exceptions import ( + InsecureRequestWarning, + ) + from .packages.ssl_match_hostname import CertificateError +-from .packages import six ++import six + from .connection import ( + port_by_scheme, + DummyConnection, +diff --git a/urllib3/fields.py b/urllib3/fields.py +index c853f8d..5fe3c24 100644 +--- a/urllib3/fields.py ++++ b/urllib3/fields.py +@@ -1,7 +1,7 @@ + import email.utils + import mimetypes + +-from .packages import six ++import six + + + def guess_content_type(filename, default='application/octet-stream'): +diff --git a/urllib3/filepost.py b/urllib3/filepost.py +index 0fbf488..97ab970 100644 +--- a/urllib3/filepost.py ++++ b/urllib3/filepost.py +@@ -3,8 +3,8 @@ import codecs + from uuid import uuid4 + from io import BytesIO + +-from .packages import six +-from .packages.six import b ++import six ++from six import b + from .fields import RequestField + + writer = codecs.lookup('utf-8')[3] +diff --git a/urllib3/response.py b/urllib3/response.py +index 15d4aac..64273db 100644 +--- a/urllib3/response.py ++++ b/urllib3/response.py +@@ -11,7 +11,7 @@ from ._collections import HTTPHeaderDict + from .exceptions import ( + ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked + ) +-from .packages.six import string_types as basestring, binary_type, PY3 ++from six import string_types as basestring, binary_type, PY3 + from .connection import HTTPException, BaseSSLError + from .util.response import is_fp_closed, is_response_to_head + +diff --git a/urllib3/util/request.py b/urllib3/util/request.py +index bc64f6b..5f4ccfd 100644 --- a/urllib3/util/request.py +++ b/urllib3/util/request.py @@ -1,6 +1,6 @@ @@ -125,9 +206,11 @@ Last-Update: 2015-05-03 ACCEPT_ENCODING = 'gzip,deflate' +diff --git a/urllib3/util/retry.py b/urllib3/util/retry.py +index 1fb1f23..178b374 100644 --- a/urllib3/util/retry.py +++ b/urllib3/util/retry.py -@@ -8,7 +8,7 @@ +@@ -8,7 +8,7 @@ from ..exceptions import ( ReadTimeoutError, ResponseError, ) @@ -136,34 +219,3 @@ Last-Update: 2015-05-03 log = logging.getLogger(__name__) ---- a/test/test_retry.py -+++ b/test/test_retry.py -@@ -1,7 +1,7 @@ - import unittest - - from urllib3.response import HTTPResponse --from urllib3.packages.six.moves import xrange -+from six.moves import xrange - from urllib3.util.retry import Retry - from urllib3.exceptions import ( - ConnectTimeoutError, ---- a/test/__init__.py -+++ b/test/__init__.py -@@ -8,7 +8,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') |