From 9fb6f314a62ca5a5fe018599d3ca56670604a688 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Fri, 16 Mar 2012 17:36:54 +0000 Subject: Refreshed 01_do-not-use-python-certifi.patch --- debian/changelog | 4 +++- debian/patches/01_do-not-use-python-certifi.patch | 18 +++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2245fcb..e857f75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,10 +5,12 @@ requests (0.10.8-1) UNRELEASED; urgency=low [ Daniele Tricoli ] * New upstream release (Closes: #663561) + * debian/patches/01_do-not-use-python-certifi.patch + - Refreshed * debian/patches/02_fix-python3-except-sintax-error.patch - Removed as it is applied upstream - -- Daniele Tricoli Fri, 16 Mar 2012 17:37:39 +0100 + -- Daniele Tricoli Fri, 16 Mar 2012 18:35:36 +0100 requests (0.10.1-1) unstable; urgency=low diff --git a/debian/patches/01_do-not-use-python-certifi.patch b/debian/patches/01_do-not-use-python-certifi.patch index 9887716..fecaf25 100644 --- a/debian/patches/01_do-not-use-python-certifi.patch +++ b/debian/patches/01_do-not-use-python-certifi.patch @@ -2,20 +2,20 @@ Description: To verify SSL certificates for HTTPS requests, use the bundle provided by ca-certificates instead of python-certifi. Author: Daniele Tricoli Forwarded: not-needed -Last-Update: 2012-02-05 +Last-Update: 2012-03-16 --- a/requests/models.py +++ b/requests/models.py -@@ -481,9 +481,9 @@ - if not cert_loc: +@@ -497,9 +497,9 @@ + if not cert_loc and self.config.get('trust_env'): cert_loc = os.environ.get('CURL_CA_BUNDLE') - + - # Use the awesome certifi list. + # On Debian use the bundle provided by ca-certificates. if not cert_loc: - cert_loc = __import__('certifi').where() + cert_loc = '/etc/ssl/certs/ca-certificates.crt' - + conn.cert_reqs = 'CERT_REQUIRED' conn.ca_certs = cert_loc --- a/setup.py @@ -23,9 +23,9 @@ Last-Update: 2012-02-05 @@ -21,7 +21,7 @@ os.system('python test_requests.py') sys.exit() - + -required = ['certifi>=0.0.7',] +required = [] - - if is_py3: - required.append('chardet2') + packages = [ + 'requests', + 'requests.packages', -- cgit v1.2.3