aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2014-10-23 01:05:41 +0000
committerDaniele Tricoli <eriol@mornie.org>2014-10-23 01:05:41 +0000
commit838af745aa1e6a83611d7b84c7a8dd2c9338450a (patch)
tree45b1191b457204d4aa34daf5ddefcd2687985a6c /debian
parent61d17a1ac5b4f66a634a5bdc203ce0efe2f36d14 (diff)
downloadpython-requests-838af745aa1e6a83611d7b84c7a8dd2c9338450a.tar
python-requests-838af745aa1e6a83611d7b84c7a8dd2c9338450a.tar.gz
Export IncompleteRead from requests.compat since it's imported by python-pip
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/03_export-IncompleteRead.patch18
-rw-r--r--debian/patches/series1
3 files changed, 27 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 8f58fb7..b7cbd21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+requests (2.4.3-2) UNRELEASED; 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..7220a11
--- /dev/null
+++ b/debian/patches/03_export-IncompleteRead.patch
@@ -0,0 +1,18 @@
+--- 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