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

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

    Date: Monday, September 22, 2014 @ 22:42:56
  Author: eriol-guest
Revision: 30721

Refresh debian/patches/01_do-not-use-embedded-python-six.patch

Modified:
  packages/python-urllib3/trunk/debian/changelog
  packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch

Modified: packages/python-urllib3/trunk/debian/changelog
===================================================================
--- packages/python-urllib3/trunk/debian/changelog	2014-09-22 21:37:45 UTC (rev 30720)
+++ packages/python-urllib3/trunk/debian/changelog	2014-09-22 22:42:56 UTC (rev 30721)
@@ -1,8 +1,10 @@
 python-urllib3 (1.9.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * debian/patches/01_do-not-use-embedded-python-six.patch
+    - Refresh.
 
- -- Daniele Tricoli <eriol at mornie.org>  Mon, 22 Sep 2014 22:38:53 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Tue, 23 Sep 2014 00:39:43 +0200
 
 python-urllib3 (1.9-1) unstable; urgency=medium
 

Modified: packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch
===================================================================
--- packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch	2014-09-22 21:37:45 UTC (rev 30720)
+++ packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch	2014-09-22 22:42:56 UTC (rev 30721)
@@ -1,7 +1,7 @@
 Description: Do not use embedded copy of python-six.
 Author: Daniele Tricoli <eriol at mornie.org>
 Forwarded: not-needed
-Last-Update: 2014-09-01
+Last-Update: 2014-09-23
 
 --- a/test/test_collections.py
 +++ b/test/test_collections.py
@@ -106,15 +106,15 @@
  __all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict']
 --- a/urllib3/connection.py
 +++ b/urllib3/connection.py
-@@ -28,7 +28,7 @@
-     ConnectTimeoutError,
- )
- from .packages.ssl_match_hostname import match_hostname
+@@ -3,7 +3,7 @@
+ import socket
+ from socket import timeout as SocketTimeout
+ import warnings
 -from .packages import six
 +import six
  
- from .util.ssl_ import (
-     resolve_cert_reqs,
+ try:  # Python 3
+     from http.client import HTTPConnection as _HTTPConnection, HTTPException
 --- a/urllib3/util/request.py
 +++ b/urllib3/util/request.py
 @@ -1,6 +1,6 @@