aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/02_do-not-use-embedded-python-six.patch
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2012-04-01 09:33:32 +0000
committerDaniele Tricoli <eriol@mornie.org>2012-04-01 09:33:32 +0000
commit67457cf217fb8bcd901a7ff6fe76493d6f0de142 (patch)
treefef8a601d9b34f79918a2c2b5b54f0962c277870 /debian/patches/02_do-not-use-embedded-python-six.patch
parent38535a1714d03f6fc7b953d824e59a90dce5682b (diff)
downloadpython-requests-67457cf217fb8bcd901a7ff6fe76493d6f0de142.tar
python-requests-67457cf217fb8bcd901a7ff6fe76493d6f0de142.tar.gz
Refreshed debian/patches/02_do-not-use-embedded-python-six.patch
Diffstat (limited to 'debian/patches/02_do-not-use-embedded-python-six.patch')
-rw-r--r--debian/patches/02_do-not-use-embedded-python-six.patch13
1 files changed, 11 insertions, 2 deletions
diff --git a/debian/patches/02_do-not-use-embedded-python-six.patch b/debian/patches/02_do-not-use-embedded-python-six.patch
index 2cd415b..f045f5a 100644
--- a/debian/patches/02_do-not-use-embedded-python-six.patch
+++ b/debian/patches/02_do-not-use-embedded-python-six.patch
@@ -5,15 +5,15 @@ Last-Update: 2012-03-19
--- a/requests/packages/urllib3/connectionpool.py
+++ b/requests/packages/urllib3/connectionpool.py
-@@ -59,7 +59,7 @@
+@@ -51,7 +51,7 @@
)
from .packages.ssl_match_hostname import match_hostname, CertificateError
-from .packages import six
+import six
- xrange = six.moves.xrange
+ xrange = six.moves.xrange
--- a/requests/packages/urllib3/filepost.py
+++ b/requests/packages/urllib3/filepost.py
@@ -14,8 +14,8 @@
@@ -38,3 +38,12 @@ Last-Update: 2012-03-19
log = logging.getLogger(__name__)
+--- a/requests/packages/urllib3/util.py
++++ b/requests/packages/urllib3/util.py
+@@ -16,7 +16,7 @@
+ except ImportError: # `select` doesn't exist on AppEngine.
+ select = False
+
+-from .packages import six
++import six
+ from .exceptions import LocationParseError