Sophie

Sophie

distrib > Mageia > 1 > i586 > media > core-updates-src > by-pkgid > 999c68f69ff3847b818e65cfbfd1a8f0 > files > 2

python-httplib2-0.7.4-1.mga1.src.rpm

diff -up ./python2/httplib2/__init__.py.orig ./python2/httplib2/__init__.py
--- ./python2/httplib2/__init__.py.orig	2012-02-24 14:07:01.232200397 +1000
+++ ./python2/httplib2/__init__.py	2012-02-24 14:13:51.290447860 +1000
@@ -177,8 +177,10 @@ class CertificateHostnameMismatch(SSLHan
 DEFAULT_MAX_REDIRECTS = 5
 
 # Default CA certificates file bundled with httplib2.
-CA_CERTS = os.path.join(
-        os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
+#CA_CERTS = os.path.join(
+#        os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
+# We use fedora ca bundle file instead, to preserve backward compability.
+CA_CERTS = "/etc/ssl/certs/ca-bundle.crt"
 
 # Which headers are hop-by-hop headers by default
 HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
diff -up ./python2/httplib2/__init__.py.getCertHost ./python2/httplib2/__init__.py
--- ./python2/httplib2/__init__.py.getCertHost	2012-05-03 17:16:33.834155219 +1000
+++ ./python2/httplib2/__init__.py	2012-06-21 18:19:33.804660257 +1000
@@ -942,11 +942,12 @@ class HTTPSConnectionWithTimeout(httplib
           list: A list of valid host globs.
         """
         if 'subjectAltName' in cert:
-            return [x[1] for x in cert['subjectAltName']
-                    if x[0].lower() == 'dns']
-        else:
-            return [x[0][1] for x in cert['subject']
-                    if x[0][0].lower() == 'commonname']
+            # Patch from richardfearn@gmail.com
+	    return [x[1] for x in cert['subjectAltName']
+                if x[0].lower() == "dns"]
+
+        return [x[0][1] for x in cert['subject']
+            if x[0][0].lower() == 'commonname']
 
     def _ValidateCertificateHostname(self, cert, hostname):
         """Validates that a given hostname is valid for an SSL certificate.
diff -up ./setup.py.orig ./setup.py
--- ./setup.py.orig	2012-03-02 21:12:34.000000000 +0100
+++ ./setup.py  	2012-06-20 13:28:26.560137617 +0200
@@ -63,7 +63,6 @@
         """,
         package_dir=pkgdir,
         packages=['httplib2'],
-        package_data={'httplib2': ['*.txt']},
         classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',