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.

Forwarded: not-needed

Patch-Name: 01_do-not-use-embedded-python-six.patch
---
 urllib3/_collections.py   | 2 +-
 urllib3/connection.py     | 2 +-
 urllib3/connectionpool.py | 2 +-
 urllib3/fields.py         | 2 +-
 urllib3/filepost.py       | 4 ++--
 urllib3/response.py       | 4 ++--
 urllib3/util/request.py   | 2 +-
 urllib3/util/response.py  | 3 ++-
 urllib3/util/retry.py     | 2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'urllib3')

diff --git a/urllib3/_collections.py b/urllib3/_collections.py
index 67f3ce9..b69ce20 100644
--- a/urllib3/_collections.py
+++ b/urllib3/_collections.py
@@ -15,7 +15,7 @@ try:  # Python 2.7+
     from collections import OrderedDict
 except ImportError:
     from .packages.ordered_dict import OrderedDict
-from .packages.six import iterkeys, itervalues, PY3
+from six import iterkeys, itervalues, PY3
 
 
 __all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict']
diff --git a/urllib3/connection.py b/urllib3/connection.py
index 1e4cd41..0075541 100644
--- a/urllib3/connection.py
+++ b/urllib3/connection.py
@@ -5,7 +5,7 @@ import sys
 import socket
 from socket import error as SocketError, timeout as SocketTimeout
 import warnings
-from .packages import six
+import six
 
 try:  # Python 3
     from http.client import HTTPConnection as _HTTPConnection
diff --git a/urllib3/connectionpool.py b/urllib3/connectionpool.py
index 995b416..2204b30 100644
--- a/urllib3/connectionpool.py
+++ b/urllib3/connectionpool.py
@@ -31,7 +31,7 @@ from .exceptions import (
     NewConnectionError,
 )
 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 c7d4811..2152829 100644
--- a/urllib3/fields.py
+++ b/urllib3/fields.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import
 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 97a2843..2fea190 100644
--- a/urllib3/filepost.py
+++ b/urllib3/filepost.py
@@ -4,8 +4,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 8f2a1b5..e034068 100644
--- a/urllib3/response.py
+++ b/urllib3/response.py
@@ -9,8 +9,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
 
diff --git a/urllib3/util/request.py b/urllib3/util/request.py
index 7377931..40bf0b4 100644
--- a/urllib3/util/request.py
+++ b/urllib3/util/request.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 from base64 import b64encode
 
-from ..packages.six import b
+from six import b
 
 ACCEPT_ENCODING = 'gzip,deflate'
 
diff --git a/urllib3/util/response.py b/urllib3/util/response.py
index bc72327..efb9e04 100644
--- a/urllib3/util/response.py
+++ b/urllib3/util/response.py
@@ -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 03a0124..fd1f5dd 100644
--- a/urllib3/util/retry.py
+++ b/urllib3/util/retry.py
@@ -9,7 +9,7 @@ from ..exceptions import (
     ReadTimeoutError,
     ResponseError,
 )
-from ..packages import six
+import six
 
 
 log = logging.getLogger(__name__)
-- 
cgit v1.2.3