aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2013-01-19 06:14:54 +0000
committerDaniele Tricoli <eriol@mornie.org>2013-01-19 06:14:54 +0000
commita5e8b39bba5d726626ed54dcd16716f9e31e89c3 (patch)
tree3fba855993bdb35f090d8dbd8a01e19358e53181 /debian/patches
parenta7bb555614a5c87d10d54e1b7707c5d09cce8040 (diff)
downloadpython-requests-a5e8b39bba5d726626ed54dcd16716f9e31e89c3.tar
python-requests-a5e8b39bba5d726626ed54dcd16716f9e31e89c3.tar.gz
Removed 02_do-not-use-embedded-python-six.patch because
no longer necessary
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/02_do-not-use-embedded-python-six.patch49
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 50 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
deleted file mode 100644
index f045f5a..0000000
--- a/debian/patches/02_do-not-use-embedded-python-six.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: Do not use embedded copy of python-six.
-Author: Daniele Tricoli <eriol@mornie.org>
-Forwarded: not-needed
-Last-Update: 2012-03-19
-
---- a/requests/packages/urllib3/connectionpool.py
-+++ b/requests/packages/urllib3/connectionpool.py
-@@ -51,7 +51,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__)
---- 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
diff --git a/debian/patches/series b/debian/patches/series
index 8d45f01..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-02_do-not-use-embedded-python-six.patch