[Python-modules-commits] r21379 - in packages/requests/trunk/debian (2 files)

[eriol-guest at users.alioth.debian.org]

    Date: Monday, April 23, 2012 @ 14:16:10
  Author: eriol-guest
Revision: 21379

Refreshed debian/patches/01_do-not-use-python-certifi.patch

Modified:
  packages/requests/trunk/debian/changelog
  packages/requests/trunk/debian/patches/01_do-not-use-python-certifi.patch

Modified: packages/requests/trunk/debian/changelog
===================================================================
--- packages/requests/trunk/debian/changelog	2012-04-23 14:01:07 UTC (rev 21378)
+++ packages/requests/trunk/debian/changelog	2012-04-23 14:16:10 UTC (rev 21379)
@@ -1,8 +1,10 @@
 requests (0.11.2-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/patches/01_do-not-use-python-certifi.patch
+    - Refreshed
 
- -- Daniele Tricoli <eriol at mornie.org>  Mon, 23 Apr 2012 10:13:41 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Mon, 23 Apr 2012 16:06:33 +0200
 
 requests (0.11.1-1) unstable; urgency=low
 

Modified: packages/requests/trunk/debian/patches/01_do-not-use-python-certifi.patch
===================================================================
--- packages/requests/trunk/debian/patches/01_do-not-use-python-certifi.patch	2012-04-23 14:01:07 UTC (rev 21378)
+++ packages/requests/trunk/debian/patches/01_do-not-use-python-certifi.patch	2012-04-23 14:16:10 UTC (rev 21379)
@@ -1,27 +1,14 @@
 Description: To verify SSL certificates for HTTPS requests, use the bundle
- provided by ca-certificates instead of python-certifi.
+ provided by ca-certificates instead of python-certifi. Since requests 0.11.2
+ it is not needed to hard-code bundle path because requests will search for it.
 Author: Daniele Tricoli <eriol at mornie.org>
 Forwarded: not-needed
-Last-Update: 2012-03-16
+Last-Update: 2012-04-23
 
---- a/requests/models.py
-+++ b/requests/models.py
-@@ -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
 +++ b/setup.py
 @@ -21,7 +21,7 @@
-     os.system('python test_requests.py')
+     os.system('python tests/test_requests.py')
      sys.exit()
 
 -required = ['certifi>=0.0.7',]