[Python-modules-commits] [requests] 05/07: merge patched into master
Daniele Tricoli
eriol-guest at moszumanska.debian.org
Mon Jul 31 00:46:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
eriol-guest pushed a commit to branch master
in repository requests.
commit 2ab3086d2d236cc74ad8743701a0f3e5e70eba45
Merge: 7466f28 711fa29
Author: Daniele Tricoli <eriol at mornie.org>
Date: Mon Jul 31 02:15:35 2017 +0200
merge patched into master
HISTORY.rst | 223 +-
LICENSE | 2 +-
MANIFEST.in | 3 +-
NOTICE | 137 -
PKG-INFO | 266 +-
README.rst | 38 +-
debian/.git-dpm | 6 +-
debian/patches/01_use-system-ca-certificates.patch | 43 +-
debian/patches/02_populate-install_requires.patch | 31 -
debian/patches/03_export-IncompleteRead.patch | 35 -
debian/patches/series | 3 -
debian/patches/use-pip-unbundling.patch | 88 -
pytest.ini | 2 +
requests/__init__.py | 59 +-
requests/__version__.py | 14 +
requests/adapters.py | 65 +-
requests/api.py | 32 +-
requests/auth.py | 13 +-
requests/cacert.pem | 5689 ---------------
requests/certs.py | 7 +-
requests/compat.py | 13 +-
requests/cookies.py | 8 +-
requests/exceptions.py | 8 +-
requests/help.py | 111 +
requests/models.py | 102 +-
requests/packages.py | 14 +
requests/packages/__init__.py | 78 -
requests/packages/chardet/__init__.py | 32 -
requests/packages/chardet/big5freq.py | 925 ---
requests/packages/chardet/big5prober.py | 42 -
requests/packages/chardet/chardetect.py | 80 -
requests/packages/chardet/chardistribution.py | 231 -
requests/packages/chardet/charsetgroupprober.py | 106 -
requests/packages/chardet/charsetprober.py | 62 -
requests/packages/chardet/codingstatemachine.py | 61 -
requests/packages/chardet/compat.py | 34 -
requests/packages/chardet/constants.py | 39 -
requests/packages/chardet/cp949prober.py | 44 -
requests/packages/chardet/escprober.py | 86 -
requests/packages/chardet/escsm.py | 242 -
requests/packages/chardet/eucjpprober.py | 90 -
requests/packages/chardet/euckrfreq.py | 596 --
requests/packages/chardet/euckrprober.py | 42 -
requests/packages/chardet/euctwfreq.py | 428 --
requests/packages/chardet/euctwprober.py | 41 -
requests/packages/chardet/gb2312freq.py | 472 --
requests/packages/chardet/gb2312prober.py | 41 -
requests/packages/chardet/hebrewprober.py | 283 -
requests/packages/chardet/jisfreq.py | 569 --
requests/packages/chardet/jpcntx.py | 227 -
requests/packages/chardet/langbulgarianmodel.py | 229 -
requests/packages/chardet/langcyrillicmodel.py | 329 -
requests/packages/chardet/langgreekmodel.py | 225 -
requests/packages/chardet/langhebrewmodel.py | 201 -
requests/packages/chardet/langhungarianmodel.py | 225 -
requests/packages/chardet/langthaimodel.py | 200 -
requests/packages/chardet/latin1prober.py | 139 -
requests/packages/chardet/mbcharsetprober.py | 86 -
requests/packages/chardet/mbcsgroupprober.py | 54 -
requests/packages/chardet/mbcssm.py | 572 --
requests/packages/chardet/sbcharsetprober.py | 120 -
requests/packages/chardet/sbcsgroupprober.py | 69 -
requests/packages/chardet/sjisprober.py | 91 -
requests/packages/chardet/universaldetector.py | 170 -
requests/packages/chardet/utf8prober.py | 76 -
requests/packages/idna/__init__.py | 1 -
requests/packages/idna/codec.py | 118 -
requests/packages/idna/compat.py | 12 -
requests/packages/idna/core.py | 387 --
requests/packages/idna/idnadata.py | 1584 -----
requests/packages/idna/intranges.py | 46 -
requests/packages/idna/uts46data.py | 7267 --------------------
requests/packages/urllib3/__init__.py | 97 -
requests/packages/urllib3/_collections.py | 324 -
requests/packages/urllib3/connection.py | 366 -
requests/packages/urllib3/connectionpool.py | 871 ---
requests/packages/urllib3/contrib/appengine.py | 296 -
requests/packages/urllib3/contrib/ntlmpool.py | 112 -
requests/packages/urllib3/contrib/pyopenssl.py | 431 --
requests/packages/urllib3/contrib/socks.py | 178 -
requests/packages/urllib3/exceptions.py | 241 -
requests/packages/urllib3/fields.py | 178 -
requests/packages/urllib3/filepost.py | 94 -
requests/packages/urllib3/packages/__init__.py | 5 -
.../urllib3/packages/backports/__init__.py | 0
.../urllib3/packages/backports/makefile.py | 53 -
requests/packages/urllib3/packages/ordered_dict.py | 259 -
requests/packages/urllib3/packages/six.py | 868 ---
.../packages/ssl_match_hostname/__init__.py | 19 -
.../packages/ssl_match_hostname/_implementation.py | 157 -
requests/packages/urllib3/poolmanager.py | 363 -
requests/packages/urllib3/request.py | 148 -
requests/packages/urllib3/response.py | 618 --
requests/packages/urllib3/util/__init__.py | 46 -
requests/packages/urllib3/util/connection.py | 145 -
requests/packages/urllib3/util/request.py | 72 -
requests/packages/urllib3/util/response.py | 81 -
requests/packages/urllib3/util/retry.py | 376 -
requests/packages/urllib3/util/ssl_.py | 336 -
requests/packages/urllib3/util/timeout.py | 245 -
requests/packages/urllib3/util/url.py | 226 -
requests/sessions.py | 204 +-
requests/status_codes.py | 2 +-
requests/utils.py | 129 +-
requirements.txt | 24 -
setup.cfg | 4 +-
setup.py | 58 +-
tests/__init__.py | 13 +
tests/compat.py | 21 +
tests/conftest.py | 24 +
tests/test_hooks.py | 23 +
tests/test_lowlevel.py | 237 +
tests/test_packages.py | 13 +
tests/test_requests.py | 2377 +++++++
tests/test_structures.py | 76 +
tests/test_testserver.py | 166 +
tests/test_utils.py | 680 ++
.../contrib => tests/testserver}/__init__.py | 0
tests/testserver/server.py | 127 +
tests/utils.py | 19 +
120 files changed, 4876 insertions(+), 30590 deletions(-)
diff --cc debian/.git-dpm
index 17049a4,0000000..7f15dfd
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
- 6bc454d8867fd0a54d2d51096e8df5723278a6fd
- 6bc454d8867fd0a54d2d51096e8df5723278a6fd
- 8846c4e00e653018ef879c74950cc90e5fe4c473
++711fa29d52f79e1513b465769154ea1f839df50c
++711fa29d52f79e1513b465769154ea1f839df50c
++41cd0f82034673ce271c530a60f9c4b3cd85bea9
+41cd0f82034673ce271c530a60f9c4b3cd85bea9
+requests_2.18.1.orig.tar.gz
+8927e5bf2feb7fa43844e4972e48f9a384f7029d
+124229
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/01_use-system-ca-certificates.patch
index de4287e,0000000..5921833
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,46 @@@
- From 89a33a2d52087def8e8e79a441ce5cfa0bbd8f87 Mon Sep 17 00:00:00 2001
++From 711fa29d52f79e1513b465769154ea1f839df50c 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 ++--
++ requests/certs.py | 8 ++++++++
+ setup.py | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
++ 2 files changed, 9 insertions(+), 1 deletion(-)
+
- 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
++index d1a378d..226aaaa 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'
++@@ -14,5 +14,13 @@ packaged CA bundle.
++ """
++ from certifi import where
+
+++try:
+++ from certifi import where
+++except ImportError:
+++ def where():
+++ """Return the preferred certificate bundle."""
+++ # 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
++index 93a8507..01275c9 100755
+--- a/setup.py
++++ b/setup.py
- @@ -70,7 +70,7 @@ setup(
- author_email='me at kennethreitz.com',
- url='http://python-requests.org',
++@@ -68,7 +68,7 @@ setup(
++ author_email=about['__author_email__'],
++ url=about['__url__'],
+ 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/series
index a679483,0000000..29a09e4
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,1 @@@
+01_use-system-ca-certificates.patch
- 03_export-IncompleteRead.patch
- 02_populate-install_requires.patch
- use-pip-unbundling.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