[Python-modules-commits] [requests] 07/08: merge patched into master
Daniele Tricoli
eriol-guest at moszumanska.debian.org
Sun May 15 17:41:26 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 0aa25038a07918c608cc325cc4f77f39e3fbaa2e
Merge: f400f74 490dac0
Author: Daniele Tricoli <eriol at mornie.org>
Date: Sun May 15 16:29:18 2016 +0200
merge patched into master
HISTORY.rst | 26 +
LICENSE | 2 +-
PKG-INFO | 96 +-
README.rst | 65 +-
debian/.git-dpm | 6 +-
debian/patches/01_use-system-ca-certificates.patch | 6 +-
debian/patches/02_populate-install_requires.patch | 10 +-
debian/patches/03_export-IncompleteRead.patch | 2 +-
requests/__init__.py | 16 +-
requests/adapters.py | 52 +-
requests/api.py | 6 +-
requests/auth.py | 19 +
requests/cookies.py | 6 +
requests/models.py | 10 +-
requests/packages/urllib3/__init__.py | 11 +-
requests/packages/urllib3/_collections.py | 2 +-
requests/packages/urllib3/connection.py | 64 +-
requests/packages/urllib3/connectionpool.py | 93 +-
requests/packages/urllib3/contrib/appengine.py | 12 +-
requests/packages/urllib3/contrib/ntlmpool.py | 20 +-
requests/packages/urllib3/contrib/pyopenssl.py | 64 +-
requests/packages/urllib3/contrib/socks.py | 172 ++
requests/packages/urllib3/exceptions.py | 8 +
requests/packages/urllib3/fields.py | 4 +-
requests/packages/urllib3/poolmanager.py | 17 +-
requests/packages/urllib3/response.py | 38 +-
requests/packages/urllib3/util/__init__.py | 2 +
requests/packages/urllib3/util/response.py | 2 +-
requests/packages/urllib3/util/retry.py | 14 +-
requests/packages/urllib3/util/ssl_.py | 11 +-
requests/sessions.py | 65 +-
requests/status_codes.py | 1 +
requests/structures.py | 4 +-
requests/utils.py | 39 +-
requirements.txt | 29 +-
setup.cfg | 3 -
setup.py | 36 +-
test_requests.py | 1746 --------------------
38 files changed, 788 insertions(+), 1991 deletions(-)
diff --cc debian/.git-dpm
index 1138d32,0000000..6d10adc
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
- fedd3e5275d3388e8d213c592aeca50640ceb372
- fedd3e5275d3388e8d213c592aeca50640ceb372
- 8565e660f5f59be865744d0a65a829f61dd16b00
++490dac0b51a3ba6df874cf91c6be969585573820
++490dac0b51a3ba6df874cf91c6be969585573820
++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/01_use-system-ca-certificates.patch
index 266bf87,0000000..ff837d0
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 34848fcf05a665d46f4ec2e9e86d98a67dcac686 Mon Sep 17 00:00:00 2001
++From b670a11fa2cd604df0351133075be4f8aa1ffb97 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 07e6475..e61ee5d 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 b7ed12b..c483535 100755
++index 3a39052..3d79616 100755
+--- a/setup.py
++++ b/setup.py
- @@ -50,7 +50,7 @@ setup(
++@@ -68,7 +68,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 a0c67f0,0000000..6c35a5a
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 fedd3e5275d3388e8d213c592aeca50640ceb372 Mon Sep 17 00:00:00 2001
++From 490dac0b51a3ba6df874cf91c6be969585573820 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 c483535..2648a3a 100755
++index 3d79616..9a49cdb 100755
+--- a/setup.py
++++ b/setup.py
- @@ -26,7 +26,9 @@ packages = [
++@@ -44,7 +44,9 @@ packages = [
+ 'requests.packages.urllib3.packages.ssl_match_hostname',
+ ]
+
+-requires = []
++requires = [
- + 'urllib3==1.13.1',
+++ 'urllib3==1.15.1',
++]
++ test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov']
+
- version = ''
+ with open('requests/__init__.py', 'r') as fd:
diff --cc debian/patches/03_export-IncompleteRead.patch
index d69e14b,0000000..0777c9c
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 30dbf485b21229072d097f532566b48521a1a9fa Mon Sep 17 00:00:00 2001
++From 03f38561a6a0efa0e41a09e2d388a920cb035b44 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 70edff7..a338846 100644
+--- a/requests/compat.py
++++ b/requests/compat.py
+@@ -40,6 +40,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
+@@ -54,6 +55,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
--
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