diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/02_do-not-use-embedded-python-six.patch | 49 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 3 insertions, 51 deletions
diff --git a/debian/changelog b/debian/changelog index 3e19911..be2d272 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ requests (1.1.0-1) UNRELEASED; urgency=low * New upstream release (Closes: #692602) - - Thanks to Barry Warsaw for report and patches! + - Thanks to Barry Warsaw for report * debian/patches/01_do-not-use-python-certifi.patch - Removed because no longer necessary + * debian/patches/02_do-not-use-embedded-python-six.patch + - Removed because no longer necessary -- Daniele Tricoli <eriol@mornie.org> Sat, 19 Jan 2013 05:09:37 +0100 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 |