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

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

    Date: Sunday, August 31, 2014 @ 23:02:07
  Author: eriol-guest
Revision: 30419

Refresh 05_do-not-use-embedded-ssl-match-hostname.patch

Modified:
  packages/python-urllib3/trunk/debian/changelog
  packages/python-urllib3/trunk/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch

Modified: packages/python-urllib3/trunk/debian/changelog
===================================================================
--- packages/python-urllib3/trunk/debian/changelog	2014-08-31 22:48:53 UTC (rev 30418)
+++ packages/python-urllib3/trunk/debian/changelog	2014-08-31 23:02:07 UTC (rev 30419)
@@ -5,8 +5,10 @@
     - Refresh
   * debian/patches/02_require-cert-verification.patch
     - Refresh
+  * debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch
+    - Refresh
 
- -- Daniele Tricoli <eriol at mornie.org>  Mon, 01 Sep 2014 00:48:18 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Mon, 01 Sep 2014 01:00:03 +0200
 
 python-urllib3 (1.8.3-1) unstable; urgency=medium
 

Modified: packages/python-urllib3/trunk/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch
===================================================================
--- packages/python-urllib3/trunk/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch	2014-08-31 22:48:53 UTC (rev 30418)
+++ packages/python-urllib3/trunk/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch	2014-08-31 23:02:07 UTC (rev 30419)
@@ -1,14 +1,14 @@
 Description: Do not use embedded copy of ssl.match_hostname.
 Author: Daniele Tricoli <eriol at mornie.org>
 Forwarded: not-needed
-Last-Update: 2014-05-25
+Last-Update: 2014-09-01
 
 --- a/test/test_connectionpool.py
 +++ b/test/test_connectionpool.py
 @@ -6,7 +6,7 @@
      HTTPConnectionPool,
  )
- from urllib3.util import Timeout
+ from urllib3.util.timeout import Timeout
 -from urllib3.packages.ssl_match_hostname import CertificateError
 +from ssl import CertificateError
  from urllib3.exceptions import (
@@ -16,20 +16,20 @@
      EmptyPoolError,
 --- a/urllib3/connection.py
 +++ b/urllib3/connection.py
-@@ -38,7 +38,7 @@
+@@ -27,7 +27,7 @@
  from .exceptions import (
      ConnectTimeoutError,
  )
 -from .packages.ssl_match_hostname import match_hostname
 +from ssl import match_hostname
  import six
- from .util import (
-     assert_fingerprint,
+ 
+ from .util.ssl_ import (
 --- a/urllib3/connectionpool.py
 +++ b/urllib3/connectionpool.py
-@@ -31,7 +31,7 @@
-     ReadTimeoutError,
-     ProxyError,
+@@ -26,7 +26,7 @@
+     TimeoutError,
+     InsecureRequestWarning,
  )
 -from .packages.ssl_match_hostname import CertificateError
 +from ssl import CertificateError
@@ -45,7 +45,7 @@
  
 --- a/setup.py
 +++ b/setup.py
-@@ -45,7 +45,7 @@
+@@ -42,7 +42,7 @@
        url='http://urllib3.readthedocs.org/',
        license='MIT',
        packages=['urllib3',
@@ -53,4 +53,4 @@
 +                'urllib3.packages',
                  'urllib3.contrib', 'urllib3.util',
                  ],
-       requires=requirements,
+       requires=[],