[Python-modules-commits] [python-urllib3] 04/13: Do not use embedded copy of python-six.
Daniele Tricoli
eriol-guest at moszumanska.debian.org
Tue Dec 6 00:15:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
eriol-guest pushed a commit to branch master
in repository python-urllib3.
commit f7c33240d2b780de08b6b483c46d43f6b8d21aac
Author: Daniele Tricoli <eriol at mornie.org>
Date: Thu Oct 8 13:19:46 2015 -0700
Do not use embedded copy of python-six.
Forwarded: not-needed
Patch-Name: 01_do-not-use-embedded-python-six.patch
---
dummyserver/handlers.py | 6 +++---
test/__init__.py | 2 +-
test/contrib/test_pyopenssl.py | 2 +-
test/test_collections.py | 2 +-
test/test_connectionpool.py | 4 ++--
test/test_fields.py | 2 +-
test/test_filepost.py | 2 +-
test/test_response.py | 2 +-
test/test_retry.py | 2 +-
test/test_util.py | 2 +-
test/with_dummyserver/test_chunked_transfer.py | 2 +-
test/with_dummyserver/test_connectionpool.py | 4 ++--
test/with_dummyserver/test_https.py | 2 +-
urllib3/_collections.py | 2 +-
urllib3/connection.py | 6 +++---
urllib3/connectionpool.py | 4 ++--
urllib3/contrib/appengine.py | 4 ++--
urllib3/contrib/ntlmpool.py | 2 +-
urllib3/exceptions.py | 2 +-
urllib3/fields.py | 2 +-
urllib3/filepost.py | 4 ++--
urllib3/poolmanager.py | 2 +-
urllib3/response.py | 4 ++--
urllib3/util/request.py | 2 +-
urllib3/util/response.py | 2 +-
urllib3/util/retry.py | 2 +-
26 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/dummyserver/handlers.py b/dummyserver/handlers.py
index bc6ad94..f51b371 100644
--- a/dummyserver/handlers.py
+++ b/dummyserver/handlers.py
@@ -15,8 +15,8 @@ from tornado import httputil
from datetime import datetime
from datetime import timedelta
-from urllib3.packages.six.moves.http_client import responses
-from urllib3.packages.six.moves.urllib.parse import urlsplit
+from six.moves.http_client import responses
+from six.moves.urllib.parse import urlsplit
log = logging.getLogger(__name__)
@@ -304,7 +304,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 bab39ed..076cdf0 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 e88edde..376b445 100644
--- a/test/contrib/test_pyopenssl.py
+++ b/test/contrib/test_pyopenssl.py
@@ -2,7 +2,7 @@
import unittest
from nose.plugins.skip import SkipTest
-from urllib3.packages import six
+import six
try:
from urllib3.contrib.pyopenssl import (inject_into_urllib3,
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 @@ from urllib3._collections import (
HTTPHeaderDict,
RecentlyUsedContainer as Container
)
-from urllib3.packages import six
+import six
xrange = six.moves.xrange
from nose.plugins.skip import SkipTest
diff --git a/test/test_connectionpool.py b/test/test_connectionpool.py
index 2fab0c6..4d8f7de 100644
--- a/test/test_connectionpool.py
+++ b/test/test_connectionpool.py
@@ -10,8 +10,8 @@ from urllib3.connectionpool import (
)
from urllib3.response import httplib, HTTPResponse
from urllib3.util.timeout import Timeout
-from urllib3.packages.six.moves.http_client import HTTPException
-from urllib3.packages.six.moves.queue import Empty
+from six.moves.http_client import HTTPException
+from six.moves.queue import Empty
from urllib3.packages.ssl_match_hostname import CertificateError
from urllib3.exceptions import (
ClosedPoolError,
diff --git a/test/test_fields.py b/test/test_fields.py
index 27dad92..61b9b9c 100644
--- a/test/test_fields.py
+++ b/test/test_fields.py
@@ -1,7 +1,7 @@
import unittest
from urllib3.fields import guess_content_type, RequestField
-from urllib3.packages.six import u, PY3
+from six import u, PY3
from . import onlyPy2
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 @@ import unittest
from urllib3.filepost import encode_multipart_formdata, iter_fields
from urllib3.fields import RequestField
-from urllib3.packages.six import b, u
+from six import b, u
BOUNDARY = '!! test boundary !!'
diff --git a/test/test_response.py b/test/test_response.py
index 10aa410..e3ea351 100644
--- a/test/test_response.py
+++ b/test/test_response.py
@@ -7,7 +7,7 @@ from urllib3.response import HTTPResponse
from urllib3.exceptions import (
DecodeError, ResponseNotChunked, ProtocolError, InvalidHeader
)
-from urllib3.packages.six.moves import http_client as httplib
+from six.moves import http_client as httplib
from urllib3.util.retry import Retry
from urllib3.util.response import is_fp_closed
diff --git a/test/test_retry.py b/test/test_retry.py
index 550dbfc..c57b48e 100644
--- 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, RequestHistory
from urllib3.exceptions import (
ConnectTimeoutError,
diff --git a/test/test_util.py b/test/test_util.py
index 23a9fe2..e0b1f1d 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -37,7 +37,7 @@ from urllib3.util.connection import (
_has_ipv6
)
from urllib3.util import is_fp_closed, ssl_
-from urllib3.packages import six
+import six
from . import clear_warnings
diff --git a/test/with_dummyserver/test_chunked_transfer.py b/test/with_dummyserver/test_chunked_transfer.py
index 04f4f8b..866689c 100644
--- a/test/with_dummyserver/test_chunked_transfer.py
+++ b/test/with_dummyserver/test_chunked_transfer.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from urllib3 import HTTPConnectionPool
-from urllib3.packages import six
+import six
from dummyserver.testcase import SocketDummyServerTestCase
diff --git a/test/with_dummyserver/test_connectionpool.py b/test/with_dummyserver/test_connectionpool.py
index e98258c..cd21496 100644
--- a/test/with_dummyserver/test_connectionpool.py
+++ b/test/with_dummyserver/test_connectionpool.py
@@ -29,8 +29,8 @@ from urllib3.exceptions import (
ProtocolError,
NewConnectionError,
)
-from urllib3.packages.six import b, u
-from urllib3.packages.six.moves.urllib.parse import urlencode
+from six import b, u
+from six.moves.urllib.parse import urlencode
from urllib3.util.retry import Retry, RequestHistory
from urllib3.util.timeout import Timeout
diff --git a/test/with_dummyserver/test_https.py b/test/with_dummyserver/test_https.py
index dc9b1f7..34473ab 100644
--- a/test/with_dummyserver/test_https.py
+++ b/test/with_dummyserver/test_https.py
@@ -37,7 +37,7 @@ from urllib3.exceptions import (
SystemTimeWarning,
InsecurePlatformWarning,
)
-from urllib3.packages import six
+import six
from urllib3.util.timeout import Timeout
import urllib3.util as util
diff --git a/urllib3/_collections.py b/urllib3/_collections.py
index 77cee01..114116c 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 e24f5e3..568eb88 100644
--- a/urllib3/connection.py
+++ b/urllib3/connection.py
@@ -6,9 +6,9 @@ import sys
import socket
from socket import error as SocketError, timeout as SocketTimeout
import warnings
-from .packages import six
-from .packages.six.moves.http_client import HTTPConnection as _HTTPConnection
-from .packages.six.moves.http_client import HTTPException # noqa: F401
+import six
+from six.moves.http_client import HTTPConnection as _HTTPConnection
+from six.moves.http_client import HTTPException # noqa: F401
try: # Compiled with SSL?
import ssl
diff --git a/urllib3/connectionpool.py b/urllib3/connectionpool.py
index 19d08f2..ad8f35a 100644
--- a/urllib3/connectionpool.py
+++ b/urllib3/connectionpool.py
@@ -24,8 +24,8 @@ from .exceptions import (
NewConnectionError,
)
from .packages.ssl_match_hostname import CertificateError
-from .packages import six
-from .packages.six.moves.queue import LifoQueue, Empty, Full
+import six
+from six.moves.queue import LifoQueue, Empty, Full
from .connection import (
port_by_scheme,
DummyConnection,
diff --git a/urllib3/contrib/appengine.py b/urllib3/contrib/appengine.py
index c3249ee..fea7cb2 100644
--- a/urllib3/contrib/appengine.py
+++ b/urllib3/contrib/appengine.py
@@ -42,7 +42,7 @@ from __future__ import absolute_import
import logging
import os
import warnings
-from ..packages.six.moves.urllib.parse import urljoin
+from six.moves.urllib.parse import urljoin
from ..exceptions import (
HTTPError,
@@ -53,7 +53,7 @@ from ..exceptions import (
SSLError
)
-from ..packages.six import BytesIO
+from six import BytesIO
from ..request import RequestMethods
from ..response import HTTPResponse
from ..util.timeout import Timeout
diff --git a/urllib3/contrib/ntlmpool.py b/urllib3/contrib/ntlmpool.py
index 642e99e..bf2ec3e 100644
--- a/urllib3/contrib/ntlmpool.py
+++ b/urllib3/contrib/ntlmpool.py
@@ -9,7 +9,7 @@ from logging import getLogger
from ntlm import ntlm
from .. import HTTPSConnectionPool
-from ..packages.six.moves.http_client import HTTPSConnection
+from six.moves.http_client import HTTPSConnection
log = getLogger(__name__)
diff --git a/urllib3/exceptions.py b/urllib3/exceptions.py
index 8a091c1..58ba5d0 100644
--- a/urllib3/exceptions.py
+++ b/urllib3/exceptions.py
@@ -1,5 +1,5 @@
from __future__ import absolute_import
-from .packages.six.moves.http_client import (
+from six.moves.http_client import (
IncompleteRead as httplib_IncompleteRead
)
# Base Exceptions
diff --git a/urllib3/fields.py b/urllib3/fields.py
index 19b0ae0..79e4236 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 cd11cee..8256115 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/poolmanager.py b/urllib3/poolmanager.py
index 276b54d..fde0cd4 100644
--- a/urllib3/poolmanager.py
+++ b/urllib3/poolmanager.py
@@ -7,7 +7,7 @@ from ._collections import RecentlyUsedContainer
from .connectionpool import HTTPConnectionPool, HTTPSConnectionPool
from .connectionpool import port_by_scheme
from .exceptions import LocationValueError, MaxRetryError, ProxySchemeUnknown
-from .packages.six.moves.urllib.parse import urljoin
+from six.moves.urllib.parse import urljoin
from .request import RequestMethods
from .util.url import parse_url
from .util.retry import Retry
diff --git a/urllib3/response.py b/urllib3/response.py
index 6f1b63c..38640dc 100644
--- a/urllib3/response.py
+++ b/urllib3/response.py
@@ -11,8 +11,8 @@ from .exceptions import (
BodyNotHttplibCompatible, ProtocolError, DecodeError, ReadTimeoutError,
ResponseNotChunked, IncompleteRead, InvalidHeader
)
-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 67cf730..9be555f 100644
--- a/urllib3/util/response.py
+++ b/urllib3/util/response.py
@@ -1,5 +1,5 @@
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 47ad539..19f0380 100644
--- a/urllib3/util/retry.py
+++ b/urllib3/util/retry.py
@@ -14,7 +14,7 @@ from ..exceptions import (
ResponseError,
InvalidHeader,
)
-from ..packages import six
+import six
log = logging.getLogger(__name__)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-urllib3.git
More information about the Python-modules-commits
mailing list