aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch')
-rw-r--r--debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch18
1 files changed, 16 insertions, 2 deletions
diff --git a/debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch b/debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch
index a6e4282..5bea26b 100644
--- a/debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch
+++ b/debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch
@@ -1,6 +1,18 @@
-Description: Rely on six to import httplib or http.client.
+From 6037bb76fda33e09811e44f56bf3dcc73daeebc4 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 13:19:52 -0700
+Subject: Rely on six to import httplib or http.client.
+
Origin: https://github.com/shazow/urllib3/commit/f4eb94bc36277d5d584683a03fc9eb3950429a15
+Patch-Name: 06_rely-on-six-to-import-httplib-or-http.client.patch
+---
+ urllib3/response.py | 5 +----
+ urllib3/util/response.py | 5 +----
+ 2 files changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/urllib3/response.py b/urllib3/response.py
+index 64273db..c41bd2c 100644
--- a/urllib3/response.py
+++ b/urllib3/response.py
@@ -1,7 +1,3 @@
@@ -11,7 +23,7 @@ Origin: https://github.com/shazow/urllib3/commit/f4eb94bc36277d5d584683a03fc9eb3
from contextlib import contextmanager
import zlib
import io
-@@ -12,6 +8,7 @@
+@@ -12,6 +8,7 @@ from .exceptions import (
ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked
)
from six import string_types as basestring, binary_type, PY3
@@ -19,6 +31,8 @@ Origin: https://github.com/shazow/urllib3/commit/f4eb94bc36277d5d584683a03fc9eb3
from .connection import HTTPException, BaseSSLError
from .util.response import is_fp_closed, is_response_to_head
+diff --git a/urllib3/util/response.py b/urllib3/util/response.py
+index 767ee15..6695809 100644
--- a/urllib3/util/response.py
+++ b/urllib3/util/response.py
@@ -1,7 +1,4 @@