diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2014-10-23 02:54:46 +0200 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2014-10-23 02:54:46 +0200 |
| commit | e2f6dccb5f27dfc3dd2accc1b35bc65eac609a0f (patch) | |
| tree | 90cf945fd2dd1ad5420bea4c310c10a3fdb88c79 | |
| parent | 4776b75bf73070d48d260e1b03084fef0c52a126 (diff) | |
| parent | 112ca6a01de6bd0388ec3737b3b5c2f7c3e978d1 (diff) | |
| download | python-requests-e2f6dccb5f27dfc3dd2accc1b35bc65eac609a0f.tar python-requests-e2f6dccb5f27dfc3dd2accc1b35bc65eac609a0f.tar.gz | |
Imported Debian patch 2.4.3-2
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/03_export-IncompleteRead.patch | 25 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 34 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 8f58fb7..96b69e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +requests (2.4.3-2) unstable; urgency=medium + + * debian/patches/03_export-IncompleteRead.patch + - Export IncompleteRead from requests.compat since it's imported by + python-pip. (Closes: #766419) + + -- Daniele Tricoli <eriol@mornie.org> Thu, 23 Oct 2014 02:54:46 +0200 + requests (2.4.3-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/03_export-IncompleteRead.patch b/debian/patches/03_export-IncompleteRead.patch new file mode 100644 index 0000000..d953df6 --- /dev/null +++ b/debian/patches/03_export-IncompleteRead.patch @@ -0,0 +1,25 @@ +Description: Export IncompleteRead from requests.compat since it's + imported by python-pip. +Author: Daniele Tricoli <eriol@mornie.org> +Forwarded: not-needed +Bug-Debian: https://bugs.debian.org/766419 +Last-Update: 2014-10-23 + +--- a/requests/compat.py ++++ b/requests/compat.py +@@ -92,6 +92,7 @@ + from Cookie import Morsel + from StringIO import StringIO + from urllib3.packages.ordered_dict import OrderedDict ++ from httplib import IncompleteRead + + builtin_str = str + bytes = str +@@ -107,6 +108,7 @@ + from http.cookies import Morsel + from io import StringIO + from collections import OrderedDict ++ from http.client import IncompleteRead + + builtin_str = str + str = str diff --git a/debian/patches/series b/debian/patches/series index 632785a..0a8f016 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 01_use-system-ca-certificates.patch 02_use-system-chardet-and-urllib3.patch +03_export-IncompleteRead.patch |