[Python-modules-commits] [requests] 06/07: merge patched into master
Daniele Tricoli
eriol-guest at moszumanska.debian.org
Wed Oct 14 23:32:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriol-guest pushed a commit to branch master
in repository requests.
commit d01fda0eb2b8256cc36b77bb586ba6bc7c58c561
Merge: 4ded421 3d3afa4
Author: Daniele Tricoli <eriol at mornie.org>
Date: Wed Oct 14 19:05:05 2015 +0200
merge patched into master
HISTORY.rst | 68 +-
PKG-INFO | 71 +-
README.rst | 1 -
debian/.git-dpm | 6 +-
debian/patches/01_use-system-ca-certificates.patch | 2 +-
debian/patches/03_export-IncompleteRead.patch | 2 +-
debian/patches/05_upstream_devendorize.patch | 53 -
debian/patches/series | 1 -
requests.egg-info/PKG-INFO | 71 +-
requests.egg-info/SOURCES.txt | 1 +
requests.egg-info/requires.txt | 3 +-
requests/__init__.py | 6 +-
requests/adapters.py | 32 +-
requests/api.py | 4 +-
requests/auth.py | 67 +-
requests/cacert.pem | 2192 +++++++++++++-------
requests/cookies.py | 9 +-
requests/hooks.py | 17 +-
requests/models.py | 75 +-
requests/packages/urllib3/__init__.py | 4 +-
requests/packages/urllib3/_collections.py | 58 +-
requests/packages/urllib3/connection.py | 29 +-
requests/packages/urllib3/connectionpool.py | 61 +-
requests/packages/urllib3/contrib/appengine.py | 222 ++
requests/packages/urllib3/contrib/pyopenssl.py | 32 +-
requests/packages/urllib3/exceptions.py | 24 +
requests/packages/urllib3/poolmanager.py | 6 +-
requests/packages/urllib3/request.py | 12 +-
requests/packages/urllib3/response.py | 159 +-
requests/packages/urllib3/util/connection.py | 10 +-
requests/packages/urllib3/util/response.py | 51 +
requests/packages/urllib3/util/retry.py | 2 +-
requests/packages/urllib3/util/ssl_.py | 54 +-
requests/sessions.py | 41 +-
requests/status_codes.py | 2 +-
requests/utils.py | 51 +-
requirements.txt | 6 +-
test_requests.py | 89 +-
38 files changed, 2370 insertions(+), 1224 deletions(-)
diff --cc debian/.git-dpm
index bacec70,0000000..a57df0b
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
- bf94fe6ca734a95614c33473cad145323d3495d3
- bf94fe6ca734a95614c33473cad145323d3495d3
- b4a5af4fcbf4e5d0f741aaf9978c728235b11a56
++3d3afa49b9ca0e898ecb09c7271d28e0c737016b
++3d3afa49b9ca0e898ecb09c7271d28e0c737016b
++cb40ec082506c0d9eb05978839bed2f12541af35
+cb40ec082506c0d9eb05978839bed2f12541af35
+requests_2.8.1.orig.tar.gz
+8488f2544b2f72ae5a366ca9973707868bdc3c74
+480803
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/01_use-system-ca-certificates.patch
index 0a503bc,0000000..d1c811b
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 3345f5ca045c5cb0a2f55ad39244c5ad37ce385e Mon Sep 17 00:00:00 2001
++From cdfced68eae64218d746e7decb6e000b1c4aae20 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 f98f528..eb444f1 100755
+--- a/setup.py
++++ b/setup.py
+@@ -50,7 +50,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/03_export-IncompleteRead.patch
index 4f8ff15,0000000..e9bfc07
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 063c9ec0a3d27a0ca437c0b8dba5ea17e2a032ef Mon Sep 17 00:00:00 2001
++From 3d3afa49b9ca0e898ecb09c7271d28e0c737016b 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
diff --cc debian/patches/series
index 9cf518f,0000000..b255d11
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
+01_use-system-ca-certificates.patch
+03_export-IncompleteRead.patch
- 05_upstream_devendorize.patch
--
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