From 838af745aa1e6a83611d7b84c7a8dd2c9338450a Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Thu, 23 Oct 2014 01:05:41 +0000 Subject: Export IncompleteRead from requests.compat since it's imported by python-pip --- debian/changelog | 8 ++++++++ debian/patches/03_export-IncompleteRead.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 27 insertions(+) create mode 100644 debian/patches/03_export-IncompleteRead.patch 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 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 -- cgit v1.2.3 From a0b26548465a2d90b49602dd3838b432695b21c2 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Thu, 23 Oct 2014 01:12:51 +0000 Subject: Make DEP3 compliant --- debian/patches/03_export-IncompleteRead.patch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/patches/03_export-IncompleteRead.patch b/debian/patches/03_export-IncompleteRead.patch index 7220a11..d953df6 100644 --- a/debian/patches/03_export-IncompleteRead.patch +++ b/debian/patches/03_export-IncompleteRead.patch @@ -1,3 +1,10 @@ +Description: Export IncompleteRead from requests.compat since it's + imported by python-pip. +Author: Daniele Tricoli +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 @@ -- cgit v1.2.3 From 112ca6a01de6bd0388ec3737b3b5c2f7c3e978d1 Mon Sep 17 00:00:00 2001 From: Piotr Ożarowski Date: Thu, 23 Oct 2014 06:55:53 +0000 Subject: s/UNRELEASED/unstable/ --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b7cbd21..96b69e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -requests (2.4.3-2) UNRELEASED; urgency=medium +requests (2.4.3-2) unstable; urgency=medium * debian/patches/03_export-IncompleteRead.patch - Export IncompleteRead from requests.compat since it's imported by -- cgit v1.2.3