[Python-modules-commits] r33961 - in packages/python-urllib3/trunk/debian (3 files)

[eriol-guest at users.alioth.debian.org]

    Date: Sunday, August 23, 2015 @ 19:23:30
  Author: eriol-guest
Revision: 33961

Add debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch

Rely on six to import httplib or http.client. Thanks to Edward Betts
for the report. (Closes: #796356)

Added:
  packages/python-urllib3/trunk/debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch
Modified:
  packages/python-urllib3/trunk/debian/changelog
  packages/python-urllib3/trunk/debian/patches/series

Modified: packages/python-urllib3/trunk/debian/changelog
===================================================================
--- packages/python-urllib3/trunk/debian/changelog	2015-08-23 19:20:32 UTC (rev 33960)
+++ packages/python-urllib3/trunk/debian/changelog	2015-08-23 19:23:30 UTC (rev 33961)
@@ -1,3 +1,11 @@
+python-urllib3 (1.11-2) UNRELEASED; urgency=medium
+
+  * debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch
+    - Rely on six to import httplib or http.client. Thanks to Edward Betts
+      for the report. (Closes: #796356)
+
+ -- Daniele Tricoli <eriol at mornie.org>  Sun, 23 Aug 2015 21:19:59 +0200
+
 python-urllib3 (1.11-1) unstable; urgency=medium
 
   * New upstream release.

Added: packages/python-urllib3/trunk/debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch
===================================================================
--- packages/python-urllib3/trunk/debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch	                        (rev 0)
+++ packages/python-urllib3/trunk/debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch	2015-08-23 19:23:30 UTC (rev 33961)
@@ -0,0 +1,32 @@
+Description: Rely on six to import httplib or http.client.
+Origin: https://github.com/shazow/urllib3/commit/f4eb94bc36277d5d584683a03fc9eb3950429a15
+
+--- a/urllib3/response.py
++++ b/urllib3/response.py
+@@ -1,7 +1,3 @@
+-try:
+-    import http.client as httplib
+-except ImportError:
+-    import httplib
+ from contextlib import contextmanager
+ import zlib
+ import io
+@@ -12,6 +8,7 @@
+     ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked
+ )
+ from six import string_types as basestring, binary_type, PY3
++from six.moves import http_client as httplib
+ from .connection import HTTPException, BaseSSLError
+ from .util.response import is_fp_closed, is_response_to_head
+ 
+--- a/urllib3/util/response.py
++++ b/urllib3/util/response.py
+@@ -1,7 +1,4 @@
+-try:
+-    import http.client as httplib
+-except ImportError:
+-    import httplib
++from six.moves import http_client as httplib
+ 
+ from ..exceptions import HeaderParsingError
+ 

Modified: packages/python-urllib3/trunk/debian/patches/series
===================================================================
--- packages/python-urllib3/trunk/debian/patches/series	2015-08-23 19:20:32 UTC (rev 33960)
+++ packages/python-urllib3/trunk/debian/patches/series	2015-08-23 19:23:30 UTC (rev 33961)
@@ -3,3 +3,4 @@
 03_force_setuptools.patch
 04_relax_nosetests_options.patch
 05_avoid-embedded-ssl-match-hostname.patch
+06_rely-on-six-to-import-httplib-or-http.client.patch