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

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

    Date: Wednesday, October 8, 2014 @ 17:50:19
  Author: eriol-guest
Revision: 30954

Refresh 01_use-system-ca-certificates.patch

Modified:
  packages/requests/trunk/debian/changelog
  packages/requests/trunk/debian/patches/01_use-system-ca-certificates.patch

Modified: packages/requests/trunk/debian/changelog
===================================================================
--- packages/requests/trunk/debian/changelog	2014-10-08 17:05:23 UTC (rev 30953)
+++ packages/requests/trunk/debian/changelog	2014-10-08 17:50:19 UTC (rev 30954)
@@ -1,6 +1,8 @@
 requests (2.4.2-1) UNRELEASED; urgency=medium
 
-  * New upstream release
+  * New upstream release.
+  * debian/patches/01_use-system-ca-certificates.patch
+    - Refresh.
   * debian/patches/02_use-system-chardet-and-urllib3.patch
     - Provide requests.packages package because it will be used to supply
       a stub for requests.packages.urllib3
@@ -8,7 +10,7 @@
     - Provide requests.packages.urllib3 as symlink of python{,3}-urllib3
       system package since it is used as import location. (Closes: #753578)
 
- -- Daniele Tricoli <eriol at mornie.org>  Wed, 08 Oct 2014 19:04:10 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Wed, 08 Oct 2014 19:46:37 +0200
 
 requests (2.3.0-1) unstable; urgency=medium
 

Modified: packages/requests/trunk/debian/patches/01_use-system-ca-certificates.patch
===================================================================
--- packages/requests/trunk/debian/patches/01_use-system-ca-certificates.patch	2014-10-08 17:05:23 UTC (rev 30953)
+++ packages/requests/trunk/debian/patches/01_use-system-ca-certificates.patch	2014-10-08 17:50:19 UTC (rev 30954)
@@ -2,22 +2,24 @@
  the embedded one.
 Author: Daniele Tricoli <eriol at mornie.org>
 Forwarded: not-needed
-Last-Update: 2013-01-19
+Last-Update: 2014-10-08
 
 --- a/requests/certs.py
 +++ b/requests/certs.py
-@@ -18,7 +18,7 @@
- def where():
-     """Return the preferred certificate bundle."""
-     # vendored bundle inside Requests
--    return os.path.join(os.path.dirname(__file__), 'cacert.pem')
-+    return '/etc/ssl/certs/ca-certificates.crt'
+@@ -18,8 +18,8 @@
+ 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())
 --- a/setup.py
 +++ b/setup.py
-@@ -41,7 +41,7 @@
+@@ -43,7 +43,7 @@
      author_email='me at kennethreitz.com',
      url='http://python-requests.org',
      packages=packages,