aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-10-08 13:41:42 -0700
committerDaniele Tricoli <eriol@mornie.org>2015-10-14 19:04:18 +0200
commitcdfced68eae64218d746e7decb6e000b1c4aae20 (patch)
treef07a715d2e8f10ec7a34ac21518feb82127995fd
parentcb40ec082506c0d9eb05978839bed2f12541af35 (diff)
downloadpython-requests-cdfced68eae64218d746e7decb6e000b1c4aae20.tar
python-requests-cdfced68eae64218d746e7decb6e000b1c4aae20.tar.gz
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
-rw-r--r--MANIFEST.in2
-rw-r--r--requests/certs.py4
-rwxr-xr-xsetup.py2
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@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,