Fix problem with ssl import in some situations.

2 files changed, 3 insertions, 3 deletions

diff --git a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py
index 1e979d6..64f2e17 100644
--- a/python2/httplib2/__init__.py
+++ b/python2/httplib2/__init__.py
@@ -63,7 +63,7 @@ except ImportError:
 try:
     import ssl # python 2.6
     _ssl_wrap_socket = ssl.wrap_socket
-except ImportError:
+except (AttributeError, ImportError):
     def _ssl_wrap_socket(sock, key_file, cert_file):
         ssl_sock = socket.ssl(sock, key_file, cert_file)
         return httplib.FakeSocket(sock, ssl_sock)
diff --git a/python2/httplib2test.py b/python2/httplib2test.py
index 1eb474e..d4c46cc 100755
--- a/python2/httplib2test.py
+++ b/python2/httplib2test.py
@@ -430,10 +430,10 @@ class HttpTest(unittest.TestCase):
         self.assertTrue(response.reason.startswith("Redirected but"))
         self.assertEqual("302", response['status'])
         self.assertTrue(content.startswith("This is content"))
- 
+
     def testGet302ViaHttps(self):
         # Google always redirects to http://google.com
-        (response, content) = self.http.request("https://google.com", "GET")
+        (response, content) = self.http.request("https://www.google.com", "GET")
         self.assertEqual(200, response.status)
         self.assertEqual(302, response.previous.status)