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 | 51 |
1 files changed, 27 insertions, 24 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 225195f..553086b 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 4e097b776bf499a02b262c722487fcd55c2ee379 Mon Sep 17 00:00:00 2001 +From 39fe68dc64cc8b675bb94892935ef2c8b50f583c 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. @@ -21,15 +21,15 @@ Patch-Name: 01_do-not-use-embedded-python-six.patch urllib3/filepost.py | 4 ++-- urllib3/response.py | 4 ++-- urllib3/util/request.py | 2 +- - urllib3/util/response.py | 2 +- + urllib3/util/response.py | 3 ++- urllib3/util/retry.py | 2 +- - 16 files changed, 18 insertions(+), 18 deletions(-) + 16 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dummyserver/handlers.py b/dummyserver/handlers.py -index 43398cd..a7828a3 100644 +index fb6f44f..c5ac9b4 100644 --- a/dummyserver/handlers.py +++ b/dummyserver/handlers.py -@@ -263,7 +263,7 @@ def _parse_header(line): +@@ -264,7 +264,7 @@ def _parse_header(line): """ import tornado.httputil import email.utils @@ -115,10 +115,10 @@ index 421e508..8fcc287 100644 from urllib3.exceptions import ( ConnectTimeoutError, diff --git a/urllib3/_collections.py b/urllib3/_collections.py -index b68b9a5..af8074a 100644 +index 67f3ce9..b69ce20 100644 --- a/urllib3/_collections.py +++ b/urllib3/_collections.py -@@ -14,7 +14,7 @@ try: # Python 2.7+ +@@ -15,7 +15,7 @@ try: # Python 2.7+ from collections import OrderedDict except ImportError: from .packages.ordered_dict import OrderedDict @@ -128,10 +128,10 @@ index b68b9a5..af8074a 100644 __all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict'] diff --git a/urllib3/connection.py b/urllib3/connection.py -index 3eab1e2..115eac9 100644 +index 1e4cd41..0075541 100644 --- a/urllib3/connection.py +++ b/urllib3/connection.py -@@ -3,7 +3,7 @@ import sys +@@ -5,7 +5,7 @@ import sys import socket from socket import error as SocketError, timeout as SocketTimeout import warnings @@ -139,12 +139,12 @@ index 3eab1e2..115eac9 100644 +import six try: # Python 3 - from http.client import HTTPConnection as _HTTPConnection, HTTPException + from http.client import HTTPConnection as _HTTPConnection diff --git a/urllib3/connectionpool.py b/urllib3/connectionpool.py -index b38ac68..563f108 100644 +index 995b416..2204b30 100644 --- a/urllib3/connectionpool.py +++ b/urllib3/connectionpool.py -@@ -30,7 +30,7 @@ from .exceptions import ( +@@ -31,7 +31,7 @@ from .exceptions import ( NewConnectionError, ) from .packages.ssl_match_hostname import CertificateError @@ -154,10 +154,10 @@ index b38ac68..563f108 100644 port_by_scheme, DummyConnection, diff --git a/urllib3/fields.py b/urllib3/fields.py -index c853f8d..5fe3c24 100644 +index c7d4811..2152829 100644 --- a/urllib3/fields.py +++ b/urllib3/fields.py -@@ -1,7 +1,7 @@ +@@ -2,7 +2,7 @@ from __future__ import absolute_import import email.utils import mimetypes @@ -167,10 +167,10 @@ index c853f8d..5fe3c24 100644 def guess_content_type(filename, default='application/octet-stream'): diff --git a/urllib3/filepost.py b/urllib3/filepost.py -index 0fbf488..97ab970 100644 +index 97a2843..2fea190 100644 --- a/urllib3/filepost.py +++ b/urllib3/filepost.py -@@ -3,8 +3,8 @@ import codecs +@@ -4,8 +4,8 @@ import codecs from uuid import uuid4 from io import BytesIO @@ -182,10 +182,10 @@ index 0fbf488..97ab970 100644 writer = codecs.lookup('utf-8')[3] diff --git a/urllib3/response.py b/urllib3/response.py -index 788eb6c..c41bd2c 100644 +index 8f2a1b5..e034068 100644 --- a/urllib3/response.py +++ b/urllib3/response.py -@@ -7,8 +7,8 @@ from ._collections import HTTPHeaderDict +@@ -9,8 +9,8 @@ from ._collections import HTTPHeaderDict from .exceptions import ( ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked ) @@ -197,10 +197,11 @@ index 788eb6c..c41bd2c 100644 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 +index 7377931..40bf0b4 100644 --- a/urllib3/util/request.py +++ b/urllib3/util/request.py -@@ -1,6 +1,6 @@ +@@ -1,7 +1,7 @@ + from __future__ import absolute_import from base64 import b64encode -from ..packages.six import b @@ -209,20 +210,22 @@ index bc64f6b..5f4ccfd 100644 ACCEPT_ENCODING = 'gzip,deflate' diff --git a/urllib3/util/response.py b/urllib3/util/response.py -index 2c1de15..6695809 100644 +index bc72327..efb9e04 100644 --- a/urllib3/util/response.py +++ b/urllib3/util/response.py -@@ -1,4 +1,4 @@ +@@ -1,5 +1,6 @@ + from __future__ import absolute_import -from ..packages.six.moves import http_client as httplib ++ +from six.moves import http_client as httplib from ..exceptions import HeaderParsingError diff --git a/urllib3/util/retry.py b/urllib3/util/retry.py -index 1fb1f23..178b374 100644 +index 03a0124..fd1f5dd 100644 --- a/urllib3/util/retry.py +++ b/urllib3/util/retry.py -@@ -8,7 +8,7 @@ from ..exceptions import ( +@@ -9,7 +9,7 @@ from ..exceptions import ( ReadTimeoutError, ResponseError, ) |