merge patched into master

5 files changed, 5 insertions, 59 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index bacec70..a57df0b 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,7 +1,7 @@
 # see git-dpm(1) from git-dpm package
-bf94fe6ca734a95614c33473cad145323d3495d3
-bf94fe6ca734a95614c33473cad145323d3495d3
-b4a5af4fcbf4e5d0f741aaf9978c728235b11a56
+3d3afa49b9ca0e898ecb09c7271d28e0c737016b
+3d3afa49b9ca0e898ecb09c7271d28e0c737016b
+cb40ec082506c0d9eb05978839bed2f12541af35
 cb40ec082506c0d9eb05978839bed2f12541af35
 requests_2.8.1.orig.tar.gz
 8488f2544b2f72ae5a366ca9973707868bdc3c74
diff --git a/debian/patches/01_use-system-ca-certificates.patch b/debian/patches/01_use-system-ca-certificates.patch
index 0a503bc..d1c811b 100644
--- a/debian/patches/01_use-system-ca-certificates.patch
+++ b/debian/patches/01_use-system-ca-certificates.patch
@@ -1,4 +1,4 @@
-From 3345f5ca045c5cb0a2f55ad39244c5ad37ce385e Mon Sep 17 00:00:00 2001
+From cdfced68eae64218d746e7decb6e000b1c4aae20 Mon Sep 17 00:00:00 2001
 From: Daniele Tricoli <eriol@mornie.org>
 Date: Thu, 8 Oct 2015 13:41:42 -0700
 Subject: Use the bundle provided by ca-certificates instead of
diff --git a/debian/patches/03_export-IncompleteRead.patch b/debian/patches/03_export-IncompleteRead.patch
index 4f8ff15..e9bfc07 100644
--- a/debian/patches/03_export-IncompleteRead.patch
+++ b/debian/patches/03_export-IncompleteRead.patch
@@ -1,4 +1,4 @@
-From 063c9ec0a3d27a0ca437c0b8dba5ea17e2a032ef Mon Sep 17 00:00:00 2001
+From 3d3afa49b9ca0e898ecb09c7271d28e0c737016b Mon Sep 17 00:00:00 2001
 From: Daniele Tricoli <eriol@mornie.org>
 Date: Thu, 8 Oct 2015 13:41:43 -0700
 Subject: Export IncompleteRead from requests.compat since it's
diff --git a/debian/patches/05_upstream_devendorize.patch b/debian/patches/05_upstream_devendorize.patch
deleted file mode 100644
index 1c5750f..0000000
--- a/debian/patches/05_upstream_devendorize.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From bf94fe6ca734a95614c33473cad145323d3495d3 Mon Sep 17 00:00:00 2001
-From: Markus Unterwaditzer <markus@unterwaditzer.net>
-Date: Fri, 24 Apr 2015 12:05:18 +0200
-Subject: Import aliases for Debian
-
-Alternative to #2375
-Patch-Name: 05_upstream_devendorize.patch
----
- requests/packages/__init__.py | 35 ++++++++++++++++++++++++++++++++++-
- 1 file changed, 34 insertions(+), 1 deletion(-)
-
-diff --git a/requests/packages/__init__.py b/requests/packages/__init__.py
-index d62c4b7..971c2ad 100644
---- a/requests/packages/__init__.py
-+++ b/requests/packages/__init__.py
-@@ -1,3 +1,36 @@
-+'''
-+Debian and other distributions "unbundle" requests' vendored dependencies, and
-+rewrite all imports to use the global versions of ``urllib3`` and ``chardet``.
-+The problem with this is that not only requests itself imports those
-+dependencies, but third-party code outside of the distros' control too.
-+
-+In reaction to these problems, the distro maintainers replaced
-+``requests.packages`` with a magical "stub module" that imports the correct
-+modules. The implementations were varying in quality and all had severe
-+problems. For example, a symlink (or hardlink) that links the correct modules
-+into place introduces problems regarding object identity, since you now have
-+two modules in `sys.modules` with the same API, but different identities::
-+
-+    requests.packages.urllib3 is not urllib3
-+
-+With version ``2.5.2``, requests started to maintain its own stub, so that
-+distro-specific breakage would be reduced to a minimum, even though the whole
-+issue is not requests' fault in the first place. See
-+https://github.com/kennethreitz/requests/pull/2375 for the corresponding pull
-+request.
-+'''
-+
- from __future__ import absolute_import
-+import sys
-+
-+try:
-+    from . import urllib3
-+except ImportError:
-+    import urllib3
-+    sys.modules['%s.urllib3' % __name__] = urllib3
- 
--from . import urllib3
-+try:
-+    from . import chardet
-+except ImportError:
-+    import chardet
-+    sys.modules['%s.chardet' % __name__] = chardet
diff --git a/debian/patches/series b/debian/patches/series
index 9cf518f..b255d11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_use-system-ca-certificates.patch
 03_export-IncompleteRead.patch
-05_upstream_devendorize.patch