[Python-modules-commits] [requests] 03/08: 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 b670a11fa2cd604df0351133075be4f8aa1ffb97
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
---
 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 3a39052..3d79616 100755
--- a/setup.py
+++ b/setup.py
@@ -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,

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