[Python-modules-commits] [requests] 02/04: merge patched into master

[Daniele Tricoli]

This is an automated email from the git hooks/post-receive script.

eriol-guest pushed a commit to branch master
in repository requests.

commit 2a1ec22e18ed524ab2a350dc35464293756f47b1
Merge: 6bc7345 3311851
Author: Daniele Tricoli <eriol at mornie.org>
Date:   Sat Jun 18 19:09:08 2016 +0200

    merge patched into master

 debian/.git-dpm                         |  4 +-
 debian/patches/series                   |  1 +
 debian/patches/use-pip-unbundling.patch | 82 +++++++++++++++++++++++++++++++++
 requests/packages/__init__.py           | 61 ++++++++++++++++++++----
 4 files changed, 136 insertions(+), 12 deletions(-)

diff --cc debian/.git-dpm
index 6d10adc,0000000..0433bdc
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 490dac0b51a3ba6df874cf91c6be969585573820
- 490dac0b51a3ba6df874cf91c6be969585573820
++3311851f0cffea52cd779d01a6bf31cd8d34a37f
++3311851f0cffea52cd779d01a6bf31cd8d34a37f
 +5ee4efb2658ebe0fad3cc5d12271af49dd073ab3
 +5ee4efb2658ebe0fad3cc5d12271af49dd073ab3
 +requests_2.10.0.orig.tar.gz
 +1b9a2395402692262fc61fa15bedbc3e112b1029
 +477617
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/series
index b57f725,0000000..a679483
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +01_use-system-ca-certificates.patch
 +03_export-IncompleteRead.patch
 +02_populate-install_requires.patch
++use-pip-unbundling.patch
diff --cc debian/patches/use-pip-unbundling.patch
index 0000000,0000000..c42f661
new file mode 100644
--- /dev/null
+++ b/debian/patches/use-pip-unbundling.patch
@@@ -1,0 -1,0 +1,82 @@@
++From 3311851f0cffea52cd779d01a6bf31cd8d34a37f Mon Sep 17 00:00:00 2001
++From: Daniele Tricoli <eriol at mornie.org>
++Date: Sat, 18 Jun 2016 18:57:45 +0200
++Subject: Use the same unbundling strategy implemented by pip
++
++Description: Use the same unbundling strategy implemented by pip.
++Author: The pip developers <python-virtualenv at groups.google.com>
++Patch-Name: use-pip-unbundling.patch
++---
++ requests/packages/__init__.py | 61 ++++++++++++++++++++++++++++++++++++-------
++ 1 file changed, 51 insertions(+), 10 deletions(-)
++
++diff --git a/requests/packages/__init__.py b/requests/packages/__init__.py
++index 971c2ad..7a87131 100644
++--- a/requests/packages/__init__.py
+++++ b/requests/packages/__init__.py
++@@ -23,14 +23,55 @@ request.
++ from __future__ import absolute_import
++ import sys
++ 
++-try:
++-    from . import urllib3
++-except ImportError:
++-    import urllib3
++-    sys.modules['%s.urllib3' % __name__] = urllib3
+++# On Debian we use the unbundling strategy implemented by pip inside
+++# pip._vendor.__init__.
+++def vendored(modulename):
+++    vendored_name = "{0}.{1}".format(__name__, modulename)
++ 
++-try:
++-    from . import chardet
++-except ImportError:
++-    import chardet
++-    sys.modules['%s.chardet' % __name__] = chardet
+++    try:
+++        __import__(vendored_name, globals(), locals(), level=0)
+++    except ImportError:
+++        try:
+++            __import__(modulename, globals(), locals(), level=0)
+++        except ImportError:
+++            # We can just silently allow import failures to pass here. If we
+++            # got to this point it means that ``import requests.packages.whatever``
+++            # failed and so did ``import whatever``. Since we're importing this
+++            # upfront in an attempt to alias imports, not erroring here will
+++            # just mean we get a regular import error whenever requests
+++            # *actually* tries to import one of these modules to use it, which
+++            # actually gives us a better error message than we would have
+++            # otherwise gotten.
+++            pass
+++        else:
+++            sys.modules[vendored_name] = sys.modules[modulename]
+++            base, head = vendored_name.rsplit(".", 1)
+++            setattr(sys.modules[base], head, sys.modules[modulename])
+++
+++vendored('chardet')
+++vendored('urllib3')
+++vendored('urllib3._collections')
+++vendored('urllib3.connection')
+++vendored('urllib3.connectionpool')
+++vendored('urllib3.contrib')
+++vendored('urllib3.contrib.ntlmpool')
+++vendored('urllib3.contrib.pyopenssl')
+++vendored('urllib3.exceptions')
+++vendored('urllib3.fields')
+++vendored('urllib3.filepost')
+++vendored('urllib3.packages')
+++vendored('urllib3.packages.ordered_dict')
+++vendored('urllib3.packages.six')
+++vendored('urllib3.packages.ssl_match_hostname')
+++vendored('urllib3.packages.ssl_match_hostname._implementation')
+++vendored('urllib3.poolmanager')
+++vendored('urllib3.request')
+++vendored('urllib3.response')
+++vendored('urllib3.util')
+++vendored('urllib3.util.connection')
+++vendored('urllib3.util.request')
+++vendored('urllib3.util.response')
+++vendored('urllib3.util.retry')
+++vendored('urllib3.util.ssl_')
+++vendored('urllib3.util.timeout')
+++vendored('urllib3.util.url')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/requests.git