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

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

    Date: Friday, March 16, 2012 @ 17:36:54
  Author: eriol-guest
Revision: 20807

Refreshed 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-03-16 16:50:21 UTC (rev 20806)
+++ packages/requests/trunk/debian/changelog	2012-03-16 17:36:54 UTC (rev 20807)
@@ -5,10 +5,12 @@
 
   [ 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 <eriol at mornie.org>  Fri, 16 Mar 2012 17:37:39 +0100
+ -- Daniele Tricoli <eriol at mornie.org>  Fri, 16 Mar 2012 18:35:36 +0100
 
 requests (0.10.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-03-16 16:50:21 UTC (rev 20806)
+++ packages/requests/trunk/debian/patches/01_do-not-use-python-certifi.patch	2012-03-16 17:36:54 UTC (rev 20807)
@@ -2,20 +2,20 @@
  provided by ca-certificates instead of python-certifi.
 Author: Daniele Tricoli <eriol at mornie.org>
 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 @@
 @@ -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',