Refreshed patches

3 files changed, 44 insertions, 39 deletions

diff --git a/debian/changelog b/debian/changelog
index 8b911bc..e4ebfaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,12 @@ python-urllib3 (1.6-1) UNRELEASED; urgency=low
 
   [ Daniele Tricoli ]
   * 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@mornie.org>  Mon, 06 May 2013 20:31:58 +0200
+ -- Daniele Tricoli <eriol@mornie.org>  Tue, 07 May 2013 05:04:41 +0200
 
 python-urllib3 (1.5-1) experimental; urgency=low
 
diff --git a/debian/patches/01_do-not-use-embedded-python-six.patch b/debian/patches/01_do-not-use-embedded-python-six.patch
index 111513d..f88c1ef 100644
--- a/debian/patches/01_do-not-use-embedded-python-six.patch
+++ b/debian/patches/01_do-not-use-embedded-python-six.patch
@@ -1,73 +1,73 @@
 Description: Do not use embedded copy of python-six.
 Author: Daniele Tricoli <eriol@mornie.org>
 Forwarded: not-needed
-Last-Update: 2012-11-09
+Last-Update: 2013-05-07
 
 --- a/test/test_collections.py
 +++ b/test/test_collections.py
 @@ -1,7 +1,7 @@
  import unittest
-
+ 
  from urllib3._collections import RecentlyUsedContainer as Container
 -from urllib3.packages import six
 +import six
  xrange = six.moves.xrange
-
-
+ 
+ 
 --- a/urllib3/connectionpool.py
 +++ b/urllib3/connectionpool.py
-@@ -52,7 +52,7 @@
+@@ -54,7 +54,7 @@
  )
-
+ 
  from .packages.ssl_match_hostname import match_hostname, CertificateError
 -from .packages import six
 +import six
-
-
+ 
+ 
  xrange = six.moves.xrange
 --- a/urllib3/filepost.py
 +++ b/urllib3/filepost.py
 @@ -10,8 +10,8 @@
  from uuid import uuid4
  from io import BytesIO
-
+ 
 -from .packages import six
 -from .packages.six import b
 +import six
 +from six import b
-
+ 
  writer = codecs.lookup('utf-8')[3]
-
+ 
 --- a/urllib3/response.py
 +++ b/urllib3/response.py
-@@ -11,7 +11,7 @@
- from io import BytesIO
-
+@@ -9,7 +9,7 @@
+ import zlib
+ 
  from .exceptions import DecodeError
--from .packages.six import string_types as basestring
-+from six import string_types as basestring
-
-
+-from .packages.six import string_types as basestring, binary_type
++from six import string_types as basestring, binary_type
+ 
+ 
  log = logging.getLogger(__name__)
 --- a/urllib3/util.py
 +++ b/urllib3/util.py
-@@ -18,7 +18,7 @@
-     except ImportError: # `select` doesn't exist on AppEngine.
-         select = False
-
+@@ -32,7 +32,7 @@
+     pass
+ 
+ 
 -from .packages import six
 +import six
- from .exceptions import LocationParseError
-
-
+ from .exceptions import LocationParseError, SSLError
+ 
+ 
 --- a/test/test_filepost.py
 +++ b/test/test_filepost.py
 @@ -1,7 +1,7 @@
  import unittest
-
+ 
  from urllib3.filepost import encode_multipart_formdata, iter_fields
 -from urllib3.packages.six import b, u
 +from six import b, u
-
-
+ 
+ 
  BOUNDARY = '!! test boundary !!'
diff --git a/debian/patches/02_require-cert-verification.patch b/debian/patches/02_require-cert-verification.patch
index b4decd9..cc2e896 100644
--- a/debian/patches/02_require-cert-verification.patch
+++ b/debian/patches/02_require-cert-verification.patch
@@ -3,17 +3,18 @@ Description: require SSL certificate validation by default by using
  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: 2013-05-07
 
-Index: python-urllib3-1.3/urllib3/connectionpool.py
-===================================================================
---- python-urllib3-1.3.orig/urllib3/connectionpool.py	2012-09-06 16:03:50.000000000 -0500
-+++ python-urllib3-1.3/urllib3/connectionpool.py	2012-09-06 16:08:59.000000000 -0500
-@@ -463,7 +463,7 @@
+--- a/urllib3/connectionpool.py
++++ b/urllib3/connectionpool.py
+@@ -523,8 +523,8 @@
+     def __init__(self, host, port=None,
                   strict=False, timeout=None, maxsize=1,
                   block=False, headers=None,
-                  key_file=None, cert_file=None,
--                 cert_reqs='CERT_NONE', ca_certs=None):
-+                 cert_reqs='CERT_REQUIRED', ca_certs='/etc/ssl/certs/ca-certificates.crt'):
+-                 key_file=None, cert_file=None, cert_reqs=None,
+-                 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):
 
-         super(HTTPSConnectionPool, self).__init__(host, port,
-                                                   strict, timeout, maxsize,
+         HTTPConnectionPool.__init__(self, host, port,