aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/01_do-not-use-embedded-python-six.patch10
-rw-r--r--debian/patches/04_relax_nosetests_options.patch4
3 files changed, 12 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 8915e52..0d5813d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
python-urllib3 (1.8.3-1) UNRELEASED; urgency=medium
* New upstream release (Closes: #754090)
+ * debian/patches/01_do-not-use-embedded-python-six.patch
+ - Refresh
+ * debian/patches/04_relax_nosetests_options.patch
+ - Refresh
- -- Daniele Tricoli <eriol@mornie.org> Mon, 07 Jul 2014 15:29:33 +0200
+ -- Daniele Tricoli <eriol@mornie.org> Mon, 07 Jul 2014 16:09:06 +0200
python-urllib3 (1.8.2-1) unstable; urgency=medium
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 f95a1e1..024180f 100644
--- a/debian/patches/01_do-not-use-embedded-python-six.patch
+++ b/debian/patches/01_do-not-use-embedded-python-six.patch
@@ -1,7 +1,7 @@
Description: Do not use embedded copy of python-six.
Author: Daniele Tricoli <eriol@mornie.org>
Forwarded: not-needed
-Last-Update: 2014-05-24
+Last-Update: 2014-07-7
--- a/test/test_collections.py
+++ b/test/test_collections.py
@@ -16,7 +16,7 @@ Last-Update: 2014-05-24
--- a/urllib3/connectionpool.py
+++ b/urllib3/connectionpool.py
-@@ -32,7 +32,7 @@
+@@ -31,7 +31,7 @@
ProxyError,
)
from .packages.ssl_match_hostname import CertificateError
@@ -27,7 +27,7 @@ Last-Update: 2014-05-24
DummyConnection,
--- a/urllib3/filepost.py
+++ b/urllib3/filepost.py
-@@ -10,8 +10,8 @@
+@@ -9,8 +9,8 @@
from uuid import uuid4
from io import BytesIO
@@ -43,7 +43,7 @@ Last-Update: 2014-05-24
@@ -11,7 +11,7 @@
from ._collections import HTTPHeaderDict
- from .exceptions import DecodeError
+ from .exceptions import DecodeError, ReadTimeoutError
-from .packages.six import string_types as basestring, binary_type
+from six import string_types as basestring, binary_type
from .util import is_fp_closed
@@ -106,7 +106,7 @@ Last-Update: 2014-05-24
__all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict']
--- a/urllib3/connection.py
+++ b/urllib3/connection.py
-@@ -39,7 +39,7 @@
+@@ -34,7 +34,7 @@
ConnectTimeoutError,
)
from .packages.ssl_match_hostname import match_hostname
diff --git a/debian/patches/04_relax_nosetests_options.patch b/debian/patches/04_relax_nosetests_options.patch
index 29e6910..2f7f8ff 100644
--- a/debian/patches/04_relax_nosetests_options.patch
+++ b/debian/patches/04_relax_nosetests_options.patch
@@ -3,7 +3,7 @@ Description: Do not use logging-clear-handlers to see all logging output and
it will be easier to backport python-urllib3 to Wheezy.
Author: Daniele Tricoli <eriol@mornie.org>
Forwarded: not-needed
-Last-Update: 2013-10-16
+Last-Update: 2014-7-7
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,4 +17,4 @@ Last-Update: 2013-10-16
+# cover-min-percentage = 100
cover-erase = true
- [egg_info]
+ [flake8]