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

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

    Date: Monday, July 7, 2014 @ 14:11:36
  Author: eriol-guest
Revision: 29676

Refresh 01_do-not-use-embedded-python-six.patch and 04_relax_nosetests_options.patch

Modified:
  packages/python-urllib3/trunk/debian/changelog
  packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch
  packages/python-urllib3/trunk/debian/patches/04_relax_nosetests_options.patch

Modified: packages/python-urllib3/trunk/debian/changelog
===================================================================
--- packages/python-urllib3/trunk/debian/changelog	2014-07-07 13:33:11 UTC (rev 29675)
+++ packages/python-urllib3/trunk/debian/changelog	2014-07-07 14:11:36 UTC (rev 29676)
@@ -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 at mornie.org>  Mon, 07 Jul 2014 15:29:33 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Mon, 07 Jul 2014 16:09:06 +0200
 
 python-urllib3 (1.8.2-1) unstable; urgency=medium
 

Modified: packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch
===================================================================
--- packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch	2014-07-07 13:33:11 UTC (rev 29675)
+++ packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch	2014-07-07 14:11:36 UTC (rev 29676)
@@ -1,7 +1,7 @@
 Description: Do not use embedded copy of python-six.
 Author: Daniele Tricoli <eriol at 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 @@
  
 --- 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 @@
      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 @@
 @@ -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 @@
  __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

Modified: packages/python-urllib3/trunk/debian/patches/04_relax_nosetests_options.patch
===================================================================
--- packages/python-urllib3/trunk/debian/patches/04_relax_nosetests_options.patch	2014-07-07 13:33:11 UTC (rev 29675)
+++ packages/python-urllib3/trunk/debian/patches/04_relax_nosetests_options.patch	2014-07-07 14:11:36 UTC (rev 29676)
@@ -3,7 +3,7 @@
  it will be easier to backport python-urllib3 to Wheezy.
 Author: Daniele Tricoli <eriol at 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 @@
 +# cover-min-percentage = 100
  cover-erase = true
  
- [egg_info]
+ [flake8]