diff --git a/programming/language/python/python-requests/files/dont-import-OrderedDict-from-urllib3.patch b/programming/language/python/python-requests/files/dont-import-OrderedDict-from-urllib3.patch new file mode 100644 index 0000000000..d42d2e35c4 --- /dev/null +++ b/programming/language/python/python-requests/files/dont-import-OrderedDict-from-urllib3.patch @@ -0,0 +1,28 @@ +From 152550287d6538e5cc7649bcf685a5a0b35058dd Mon Sep 17 00:00:00 2001 +From: Jeremy Cline +Date: Tue, 12 Jun 2018 14:06:00 -0400 +Subject: [PATCH] Don't import OrderedDict from urllib3 + +We unbundle urllib3, just use collections (py2.7+) + +Signed-off-by: Jeremy Cline +--- + requests/compat.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/requests/compat.py b/requests/compat.py +index 6b9c6fac..6ba6e460 100644 +--- a/requests/compat.py ++++ b/requests/compat.py +@@ -45,7 +45,7 @@ if is_py2: + from StringIO import StringIO + from collections import Callable, Mapping, MutableMapping + +- from urllib3.packages.ordered_dict import OrderedDict ++ from collections import OrderedDict # py2.7+ + + builtin_str = str + bytes = str +-- +2.17.1 + diff --git a/programming/language/python/python-requests/files/patch-requests-certs.py-to-use-the-system-CA-bundle.patch b/programming/language/python/python-requests/files/patch-requests-certs.py-to-use-the-system-CA-bundle.patch new file mode 100644 index 0000000000..21626f8721 --- /dev/null +++ b/programming/language/python/python-requests/files/patch-requests-certs.py-to-use-the-system-CA-bundle.patch @@ -0,0 +1,49 @@ +rom fd9ab446d8479360d2c1c8252508d97d58ed3e0e Mon Sep 17 00:00:00 2001 +From: Jeremy Cline +Date: Mon, 19 Jun 2017 16:09:02 -0400 +Subject: [PATCH] Patch requests/certs.py to use the system CA bundle + +Signed-off-by: Jeremy Cline +--- + requests/certs.py | 11 ++++++++++- + setup.py | 1 - + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/requests/certs.py b/requests/certs.py +index d1a378d..7b103ba 100644 +--- a/requests/certs.py ++++ b/requests/certs.py +@@ -11,8 +11,17 @@ only one — the one from the certifi package. + If you are packaging Requests, e.g., for a Linux distribution or a managed + environment, you can change the definition of where() to return a separately + packaged CA bundle. ++ ++This Fedora-patched package returns "/etc/ssl/certs/ca-certificates.crt" provided ++by the ca-certificates RPM package. + """ +-from certifi import where ++try: ++ from certifi import where ++except ImportError: ++ def where(): ++ """Return the absolute path to the system CA bundle.""" ++ return '/etc/ssl/certs/ca-certificates.crt' ++ + + if __name__ == '__main__': + print(where()) +diff --git a/setup.py b/setup.py +index 93a8507..2db9569 100755 +--- a/setup.py ++++ b/setup.py +@@ -45,7 +45,6 @@ requires = [ + 'chardet>=3.0.2,<3.1.0', + 'idna>=2.5,<2.8', + 'urllib3>=1.21.1,<1.24', +- 'certifi>=2017.4.17' + + ] + test_requirements = ['pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock', 'pytest-xdist', 'PySocks>=1.5.6, !=1.5.7', 'pytest>=2.8.0'] +-- +2.9.4 + diff --git a/programming/language/python/python-requests/pspec.xml b/programming/language/python/python-requests/pspec.xml index a6f09eedb6..afc5d99338 100644 --- a/programming/language/python/python-requests/pspec.xml +++ b/programming/language/python/python-requests/pspec.xml @@ -16,6 +16,10 @@ python-devel python-setuptools + + dont-import-OrderedDict-from-urllib3.patch + patch-requests-certs.py-to-use-the-system-CA-bundle.patch + @@ -30,6 +34,13 @@ + + 2018-09-21 + 2.19.1 + Rebuild certifi. + Pisi Linux Community + admin@pisilinux.org + 2018-08-15 2.19.1