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

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

    Date: Sunday, August 31, 2014 @ 22:48:53
  Author: eriol-guest
Revision: 30418

Refresh 02_require-cert-verification.patch

Modified:
  packages/python-urllib3/trunk/debian/changelog
  packages/python-urllib3/trunk/debian/patches/02_require-cert-verification.patch

Modified: packages/python-urllib3/trunk/debian/changelog
===================================================================
--- packages/python-urllib3/trunk/debian/changelog	2014-08-31 22:43:19 UTC (rev 30417)
+++ packages/python-urllib3/trunk/debian/changelog	2014-08-31 22:48:53 UTC (rev 30418)
@@ -3,8 +3,10 @@
   * New upstream release
   * debian/patches/01_do-not-use-embedded-python-six.patch
     - Refresh
+  * debian/patches/02_require-cert-verification.patch
+    - Refresh
 
- -- Daniele Tricoli <eriol at mornie.org>  Mon, 01 Sep 2014 00:42:17 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Mon, 01 Sep 2014 00:48:18 +0200
 
 python-urllib3 (1.8.3-1) unstable; urgency=medium
 

Modified: packages/python-urllib3/trunk/debian/patches/02_require-cert-verification.patch
===================================================================
--- packages/python-urllib3/trunk/debian/patches/02_require-cert-verification.patch	2014-08-31 22:43:19 UTC (rev 30417)
+++ packages/python-urllib3/trunk/debian/patches/02_require-cert-verification.patch	2014-08-31 22:48:53 UTC (rev 30418)
@@ -3,11 +3,11 @@
  CERT_REQUIRED and using the system /etc/ssl/certs/ca-certificates.crt
 Bug-Ubuntu: https://launchpad.net/bugs/1047054
 Bug-Debian: http://bugs.debian.org/686872
-Last-Update: 2014-05-24
+Last-Update: 2014-09-01
 
 --- a/urllib3/connectionpool.py
 +++ b/urllib3/connectionpool.py
-@@ -591,6 +591,8 @@
+@@ -628,6 +628,8 @@
      ``ssl_version`` are only used if :mod:`ssl` is available and are fed into
      :meth:`urllib3.util.ssl_wrap_socket` to upgrade the connection socket
      into an SSL socket.
@@ -16,9 +16,9 @@
      """
  
      scheme = 'https'
-@@ -600,8 +602,8 @@
-                  strict=False, timeout=None, maxsize=1,
-                  block=False, headers=None,
+@@ -637,8 +639,8 @@
+                  strict=False, timeout=Timeout.DEFAULT_TIMEOUT, maxsize=1,
+                  block=False, headers=None, retries=None,
                   _proxy=None, _proxy_headers=None,
 -                 key_file=None, cert_file=None, cert_reqs=None,
 -                 ca_certs=None, ssl_version=None,