[Python-modules-commits] [requests] 08/09: merge patched into master
Daniele Tricoli
eriol-guest at moszumanska.debian.org
Mon Dec 19 19:35:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
eriol-guest pushed a commit to branch master
in repository requests.
commit aef5e0b7a9860653b0e00bd4e4de3bcd06bf1eeb
Merge: c0aab97 6bc454d
Author: Daniele Tricoli <eriol at mornie.org>
Date: Mon Dec 19 19:57:50 2016 +0100
merge patched into master
HISTORY.rst | 9 ++++++
PKG-INFO | 11 +++++++-
debian/.git-dpm | 6 ++--
debian/patches/01_use-system-ca-certificates.patch | 2 +-
debian/patches/02_populate-install_requires.patch | 2 +-
debian/patches/03_export-IncompleteRead.patch | 2 +-
debian/patches/use-pip-unbundling.patch | 2 +-
requests/__init__.py | 4 +--
requests/auth.py | 33 ++++++++++++++++++++--
9 files changed, 59 insertions(+), 12 deletions(-)
diff --cc debian/.git-dpm
index ec557a2,0000000..493c0ac
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
- 0ae6c4a0ea9a0ba2c86395b1b9aa19019ed787d4
- 0ae6c4a0ea9a0ba2c86395b1b9aa19019ed787d4
- 6b96ae7a5abcfbac987960fd9585ae4a88908030
++6bc454d8867fd0a54d2d51096e8df5723278a6fd
++6bc454d8867fd0a54d2d51096e8df5723278a6fd
++8846c4e00e653018ef879c74950cc90e5fe4c473
+8846c4e00e653018ef879c74950cc90e5fe4c473
+requests_2.12.4.orig.tar.gz
+dfbb6fb38b92d2ac5a982c660df9727536dab70c
+547650
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/01_use-system-ca-certificates.patch
index 36273bd,0000000..de4287e
mode 100644,000000..100644
--- a/debian/patches/01_use-system-ca-certificates.patch
+++ b/debian/patches/01_use-system-ca-certificates.patch
@@@ -1,51 -1,0 +1,51 @@@
- From 7183f987a669e3ebce77e253651a02d8e0dd1da6 Mon Sep 17 00:00:00 2001
++From 89a33a2d52087def8e8e79a441ce5cfa0bbd8f87 Mon Sep 17 00:00:00 2001
+From: Daniele Tricoli <eriol at mornie.org>
+Date: Thu, 8 Oct 2015 13:41:42 -0700
+Subject: Use the bundle provided by ca-certificates instead of
+
+ the embedded one.
+Forwarded: not-needed
+Last-Update: 2014-10-08
+
+Patch-Name: 01_use-system-ca-certificates.patch
+---
+ MANIFEST.in | 2 +-
+ requests/certs.py | 4 ++--
+ setup.py | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/MANIFEST.in b/MANIFEST.in
+index 439de49..7888aee 100644
+--- a/MANIFEST.in
++++ b/MANIFEST.in
+@@ -1 +1 @@
+-include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt requests/cacert.pem
++include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt
+diff --git a/requests/certs.py b/requests/certs.py
+index f922b99..248d12f 100644
+--- a/requests/certs.py
++++ b/requests/certs.py
+@@ -18,8 +18,8 @@ try:
+ except ImportError:
+ def where():
+ """Return the preferred certificate bundle."""
+- # vendored bundle inside Requests
+- return os.path.join(os.path.dirname(__file__), 'cacert.pem')
++ # On Debian systems use ca-certificates
++ return '/etc/ssl/certs/ca-certificates.crt'
+
+ if __name__ == '__main__':
+ print(where())
+diff --git a/setup.py b/setup.py
+index c240624..1fc2a6e 100755
+--- a/setup.py
++++ b/setup.py
+@@ -70,7 +70,7 @@ setup(
+ author_email='me at kennethreitz.com',
+ url='http://python-requests.org',
+ packages=packages,
+- package_data={'': ['LICENSE', 'NOTICE'], 'requests': ['*.pem']},
++ package_data={'': ['LICENSE', 'NOTICE'],},
+ package_dir={'requests': 'requests'},
+ include_package_data=True,
+ install_requires=requires,
diff --cc debian/patches/02_populate-install_requires.patch
index ea71fdf,0000000..9f2af11
mode 100644,000000..100644
--- a/debian/patches/02_populate-install_requires.patch
+++ b/debian/patches/02_populate-install_requires.patch
@@@ -1,31 -1,0 +1,31 @@@
- From c3ded8d7c950503babbb28c6f051b28207a71be9 Mon Sep 17 00:00:00 2001
++From e12a8e6bd338d94b2f756c3defe3fcd53f83635d Mon Sep 17 00:00:00 2001
+From: Daniele Tricoli <eriol at mornie.org>
+Date: Fri, 23 Oct 2015 16:03:52 +0200
+Subject: Populate install_requires for unbundled packages
+
+This will avoid breakage updating urllib3 via pip when requests/urllib3
+are already installed via the system packages.
+
+Forwarded: not-needed
+Bug-OpenStack: https://review.openstack.org/#/c/213310/0
+Bug-Upstream: https://github.com/kennethreitz/requests/issues/2816
+Patch-Name: 02_populate-install_requires.patch
+---
+ setup.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 1fc2a6e..2064769 100755
+--- a/setup.py
++++ b/setup.py
+@@ -46,7 +46,9 @@ packages = [
+ 'requests.packages.urllib3.packages.backports',
+ ]
+
+-requires = []
++requires = [
++ 'urllib3==1.19.1',
++]
+ test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov']
+
+ with open('requests/__init__.py', 'r') as fd:
diff --cc debian/patches/03_export-IncompleteRead.patch
index aef6430,0000000..771ad13
mode 100644,000000..100644
--- a/debian/patches/03_export-IncompleteRead.patch
+++ b/debian/patches/03_export-IncompleteRead.patch
@@@ -1,35 -1,0 +1,35 @@@
- From 34449a565a491981ce91edf1c6a24acb37cee20f Mon Sep 17 00:00:00 2001
++From 8f4c01a92533554d4dcee9e67dc9b9e9b429ae6a Mon Sep 17 00:00:00 2001
+From: Daniele Tricoli <eriol at mornie.org>
+Date: Thu, 8 Oct 2015 13:41:43 -0700
+Subject: Export IncompleteRead from requests.compat since it's
+
+ imported by python-pip.
+Forwarded: not-needed
+Bug-Debian: https://bugs.debian.org/766419
+Last-Update: 2014-10-23
+
+Patch-Name: 03_export-IncompleteRead.patch
+---
+ requests/compat.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/requests/compat.py b/requests/compat.py
+index f88e600..dc1c250 100644
+--- a/requests/compat.py
++++ b/requests/compat.py
+@@ -44,6 +44,7 @@ if is_py2:
+ from Cookie import Morsel
+ from StringIO import StringIO
+ from .packages.urllib3.packages.ordered_dict import OrderedDict
++ from httplib import IncompleteRead
+
+ builtin_str = str
+ bytes = str
+@@ -59,6 +60,7 @@ elif is_py3:
+ from http.cookies import Morsel
+ from io import StringIO
+ from collections import OrderedDict
++ from http.client import IncompleteRead
+
+ builtin_str = str
+ str = str
diff --cc debian/patches/use-pip-unbundling.patch
index e6877b9,0000000..996786a
mode 100644,000000..100644
--- a/debian/patches/use-pip-unbundling.patch
+++ b/debian/patches/use-pip-unbundling.patch
@@@ -1,88 -1,0 +1,88 @@@
- From 0ae6c4a0ea9a0ba2c86395b1b9aa19019ed787d4 Mon Sep 17 00:00:00 2001
++From 6bc454d8867fd0a54d2d51096e8df5723278a6fd 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 | 66 +++++++++++++++++++++++++++++++++----------
+ 1 file changed, 51 insertions(+), 15 deletions(-)
+
+diff --git a/requests/packages/__init__.py b/requests/packages/__init__.py
+index 4077265..b1206b2 100644
+--- a/requests/packages/__init__.py
++++ b/requests/packages/__init__.py
+@@ -23,20 +23,56 @@ 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])
+
+-try:
+- from . import idna
+-except ImportError:
+- import idna
+- sys.modules['%s.idna' % __name__] = idna
++vendored('chardet')
++vendored('idna')
++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
More information about the Python-modules-commits
mailing list