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

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

    Date: Saturday, May 24, 2014 @ 17:17:39
  Author: eriol-guest
Revision: 29051

Refreshed 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-05-24 14:25:34 UTC (rev 29050)
+++ packages/python-urllib3/trunk/debian/changelog	2014-05-24 17:17:39 UTC (rev 29051)
@@ -3,8 +3,10 @@
   * New upstream release
   * debian/patches/01_do-not-use-embedded-python-six.patch
     - Refreshed
+  * debian/patches/02_require-cert-verification.patch
+    - Refreshed
 
- -- Daniele Tricoli <eriol at mornie.org>  Sat, 24 May 2014 16:24:14 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Sat, 24 May 2014 19:12:41 +0200
 
 python-urllib3 (1.8-2) 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-05-24 14:25:34 UTC (rev 29050)
+++ packages/python-urllib3/trunk/debian/patches/02_require-cert-verification.patch	2014-05-24 17:17:39 UTC (rev 29051)
@@ -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-03-31
+Last-Update: 2014-05-24
 
 --- a/urllib3/connectionpool.py
 +++ b/urllib3/connectionpool.py
-@@ -583,6 +583,8 @@
+@@ -591,6 +591,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,7 +16,7 @@
      """
  
      scheme = 'https'
-@@ -592,8 +594,8 @@
+@@ -600,8 +602,8 @@
                   strict=False, timeout=None, maxsize=1,
                   block=False, headers=None,
                   _proxy=None, _proxy_headers=None,
@@ -24,6 +24,6 @@
 -                 ca_certs=None, ssl_version=None,
 +                 key_file=None, cert_file=None, cert_reqs='CERT_REQUIRED',
 +                 ca_certs='/etc/ssl/certs/ca-certificates.crt', ssl_version=None,
-                  assert_hostname=None, assert_fingerprint=None):
+                  assert_hostname=None, assert_fingerprint=None,
+                  **conn_kw):
  
-         HTTPConnectionPool.__init__(self, host, port, strict, timeout, maxsize,