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

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

    Date: Thursday, November 13, 2014 @ 06:48:32
  Author: tianon-guest
Revision: 31435

Remove 02_use-system-urllib3.patch thanks to the fix in requests

Modified:
  packages/python-docker/trunk/debian/changelog
  packages/python-docker/trunk/debian/patches/series
Deleted:
  packages/python-docker/trunk/debian/patches/02_use-system-urllib3.patch

Modified: packages/python-docker/trunk/debian/changelog
===================================================================
--- packages/python-docker/trunk/debian/changelog	2014-11-13 05:58:04 UTC (rev 31434)
+++ packages/python-docker/trunk/debian/changelog	2014-11-13 06:48:32 UTC (rev 31435)
@@ -1,3 +1,9 @@
+python-docker (0.5.3-2) UNRELEASED; urgency=medium
+
+  * Remove 02_use-system-urllib3.patch thanks to the fix in requests
+
+ -- Tianon Gravi <admwiggin at gmail.com>  Thu, 13 Nov 2014 06:29:26 +0000
+
 python-docker (0.5.3-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.

Deleted: packages/python-docker/trunk/debian/patches/02_use-system-urllib3.patch
===================================================================
--- packages/python-docker/trunk/debian/patches/02_use-system-urllib3.patch	2014-11-13 05:58:04 UTC (rev 31434)
+++ packages/python-docker/trunk/debian/patches/02_use-system-urllib3.patch	2014-11-13 06:48:32 UTC (rev 31435)
@@ -1,33 +0,0 @@
-Description: Use the system python-urllib3 instead of the
- requests.packages.urllib3.
-Author: Jakub Warmuz <jakub at warmuz.org>
-Last-Update: 2014-11-01
-
---- a/docker/ssladapter/ssladapter.py
-+++ b/docker/ssladapter/ssladapter.py
-@@ -4,10 +4,7 @@
- """
- from distutils.version import StrictVersion
- from requests.adapters import HTTPAdapter
--try:
--    import requests.packages.urllib3 as urllib3
--except ImportError:
--    import urllib3
-+import urllib3
- 
- 
- PoolManager = urllib3.poolmanager.PoolManager
---- a/docker/unixconn/unixconn.py
-+++ b/docker/unixconn/unixconn.py
-@@ -20,10 +20,7 @@
- import requests.adapters
- import socket
- 
--try:
--    import requests.packages.urllib3.connectionpool as connectionpool
--except ImportError:
--    import urllib3.connectionpool as connectionpool
-+import urllib3.connectionpool as connectionpool
- 
- 
- class UnixHTTPConnection(httplib.HTTPConnection, object):

Modified: packages/python-docker/trunk/debian/patches/series
===================================================================
--- packages/python-docker/trunk/debian/patches/series	2014-11-13 05:58:04 UTC (rev 31434)
+++ packages/python-docker/trunk/debian/patches/series	2014-11-13 06:48:32 UTC (rev 31435)
@@ -1,4 +1,2 @@
 # see https://github.com/dotcloud/docker-py/issues/101
 01_requirements.patch
-# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767445
-02_use-system-urllib3.patch