From 813bdb99d78a260fb237b42b82fc15bb8386249b Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Sun, 18 Mar 2012 23:47:04 +0000 Subject: Removed embedded copy of python-six --- .../02_do-not-use-embedded-python-six.patch | 40 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 41 insertions(+) create mode 100644 debian/patches/02_do-not-use-embedded-python-six.patch (limited to 'debian/patches') diff --git a/debian/patches/02_do-not-use-embedded-python-six.patch b/debian/patches/02_do-not-use-embedded-python-six.patch new file mode 100644 index 0000000..2cd415b --- /dev/null +++ b/debian/patches/02_do-not-use-embedded-python-six.patch @@ -0,0 +1,40 @@ +Description: Do not use embedded copy of python-six. +Author: Daniele Tricoli +Forwarded: not-needed +Last-Update: 2012-03-19 + +--- a/requests/packages/urllib3/connectionpool.py ++++ b/requests/packages/urllib3/connectionpool.py +@@ -59,7 +59,7 @@ + ) + + from .packages.ssl_match_hostname import match_hostname, CertificateError +-from .packages import six ++import six + + xrange = six.moves.xrange + +--- a/requests/packages/urllib3/filepost.py ++++ b/requests/packages/urllib3/filepost.py +@@ -14,8 +14,8 @@ + + from io import BytesIO + +-from .packages import six +-from .packages.six import b ++import six ++from six import b + + writer = codecs.lookup('utf-8')[3] + +--- a/requests/packages/urllib3/response.py ++++ b/requests/packages/urllib3/response.py +@@ -11,7 +11,7 @@ + from io import BytesIO + + from .exceptions import HTTPError +-from .packages.six import string_types as basestring ++from six import string_types as basestring + + + log = logging.getLogger(__name__) diff --git a/debian/patches/series b/debian/patches/series index 94aff1f..45a01fe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01_do-not-use-python-certifi.patch +02_do-not-use-embedded-python-six.patch -- cgit v1.2.3