[Python-modules-commits] [requests] 04/07: Use the bundle provided by ca-certificates instead of

[Daniele Tricoli]

This is an automated email from the git hooks/post-receive script.

eriol-guest pushed a commit to branch master
in repository requests.

commit 711fa29d52f79e1513b465769154ea1f839df50c
Author: Daniele Tricoli <eriol at mornie.org>
Date:   Thu Oct 8 13:41:42 2015 -0700

    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
---
 requests/certs.py | 8 ++++++++
 setup.py          | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/requests/certs.py b/requests/certs.py
index d1a378d..226aaaa 100644
--- a/requests/certs.py
+++ b/requests/certs.py
@@ -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 93a8507..01275c9 100755
--- a/setup.py
+++ b/setup.py
@@ -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,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/requests.git