Fixes for full successful re-run of unit tests against Python 2.7 and

3.4

Author: philipkershaw

ndg/httpsclient/https.py

@@ -17,11 +17,13 @@
 if sys.version_info[0] > 2:
     from http.client import HTTPS_PORT
     from http.client import HTTPConnection
+
+    from urllib.request import AbstractHTTPHandler
 else:
     from httplib import HTTPS_PORT
     from httplib import HTTPConnection
 
-from urllib2 import AbstractHTTPHandler
+    from urllib2 import AbstractHTTPHandler
 
 
 from OpenSSL import SSL
@@ -114,7 +116,7 @@ def __init__(self, ssl_context, debuglevel=0):
                                 ssl_context)
             self.ssl_context = ssl_context
         else:
-            self.ssl_context = SSL.Context(SSL.SSLv23_METHOD)
+            self.ssl_context = SSL.Context(SSL.TLSv1_METHOD)
 
     def https_open(self, req):
         """Opens HTTPS request

ndg/httpsclient/ssl_context_util.py

@@ -8,6 +8,8 @@
 __license__ = "BSD - see LICENSE file in top-level directory"
 __contact__ = "[email protected]"
 __revision__ = '$Id$'
+import sys
+
 if sys.version_info[0] > 2:
     import urllib.parse as urlparse_
 else:

ndg/httpsclient/ssl_peer_verification.py

@@ -14,6 +14,7 @@
     from ndg.httpsclient.subj_alt_name import SubjectAltName
     from pyasn1.codec.der import decoder as der_decoder
     SUBJ_ALT_NAME_SUPPORT = True
+    
 except ImportError as e:
     SUBJ_ALT_NAME_SUPPORT = False
     SUBJ_ALT_NAME_SUPPORT_MSG = (
@@ -156,12 +157,12 @@ def __call__(self, connection, peerCert, errorStatus, errorDepth,
             return preverifyOK
 
     def get_verify_server_cert_func(self):
-         def verify_server_cert(connection, peerCert, errorStatus, errorDepth,
-                 preverifyOK):
-              return self.__call__(connection, peerCert, errorStatus,
-                                   errorDepth, preverifyOK)
-
-         return verify_server_cert
+        def verify_server_cert(connection, peerCert, errorStatus, errorDepth,
+                preverifyOK):
+            return self.__call__(connection, peerCert, errorStatus,
+                                 errorDepth, preverifyOK)
+        
+        return verify_server_cert
 
     @classmethod
     def _get_subj_alt_name(cls, peer_cert):

ndg/httpsclient/ssl_socket.py

@@ -15,9 +15,10 @@
 import sys
 
 if sys.version_info[0] > 2:
-    from io import StringIO
+    # Make use of byte buffer for Python 3
+    from io import BytesIO as BufferIO_
 else:
-    from cStringIO import StringIO
+    from cStringIO import StringIO as BufferIO_
 
 from OpenSSL import SSL
 
@@ -74,14 +75,12 @@ def buf_size(self, value):
     def close(self):
         """Shutdown the SSL connection and call the close method of the
         underlying socket"""
-#        try:
-#            self.__ssl_conn.shutdown()
-#        except SSL.Error:
-#            # Make errors on shutdown non-fatal
-#            pass
-
         if self._makefile_refs < 1:        
-            self.__ssl_conn.shutdown()
+            try:
+                self.__ssl_conn.shutdown()
+            except (SSL.Error, SSL.SysCallError):
+                # Make errors on shutdown non-fatal
+                pass
         else:
             self._makefile_refs -= 1
 
@@ -241,7 +240,7 @@ def makefile(self, *args):
         _buf_size = self.buf_size
 
         i=0
-        stream = StringIO()
+        stream = BufferIO_()
         startTime = datetime.utcnow()
         try:
             dat = self.__ssl_conn.recv(_buf_size)
@@ -266,17 +265,6 @@ def makefile(self, *args):
         stream.seek(0)
 
         return stream
-
-#    def makefile(self, mode='r', bufsize=-1):
-#
-#        """Make and return a file-like object that
-#        works with the SSL connection.  Just use the code
-#        from the socket module."""
-#
-#        self._makefile_refs += 1
-#        # close=True so as to decrement the reference count when done with
-#        # the file-like object.
-#        return socket._fileobject(self.socket, mode, bufsize, close=True)
 
     def getsockname(self):
         """

ndg/httpsclient/test/test_utils.py

@@ -23,17 +23,17 @@ class TestUtilsModule(unittest.TestCase):
     '''Test ndg.httpsclient.utils module'''
 
     def test01_configuration(self):
-        config = Configuration(SSL.Context(SSL.SSLv3_METHOD), True)
+        config = Configuration(SSL.Context(SSL.TLSv1_METHOD), True)
         self.assertTrue(config.ssl_context)
         self.assertEqual(config.debug, True)
 
     def test02_fetch_from_url(self):
-        config = Configuration(SSL.Context(SSL.SSLv3_METHOD), True)
+        config = Configuration(SSL.Context(SSL.TLSv1_METHOD), True)
         res = fetch_from_url(Constants.TEST_URI, config)
         self.assertTrue(res)
 
     def test03_open_url(self):
-        config = Configuration(SSL.Context(SSL.SSLv3_METHOD), True)
+        config = Configuration(SSL.Context(SSL.TLSv1_METHOD), True)
         res = open_url(Constants.TEST_URI, config)
         self.assertEqual(res[0], 200, 
                          'open_url for %r failed' % Constants.TEST_URI)
@@ -57,5 +57,6 @@ def test04__should_use_proxy(self):
         else:
             del os.environ['no_proxy']
 
+
 if __name__ == "__main__":
     unittest.main()

ndg/httpsclient/urllib2_build_opener.py

@@ -13,13 +13,18 @@
 # Py 2 <=> 3 compatibility for class type checking
 if sys.version_info[0] > 2:
     class_type_ = type
+    from urllib.request import (ProxyHandler, UnknownHandler, 
+                                HTTPDefaultErrorHandler, FTPHandler, 
+                                FileHandler, HTTPErrorProcessor, 
+                                HTTPHandler, OpenerDirector, 
+                                HTTPRedirectHandler)
 else:
     import types
     class_type_ = types.ClassType
 
-from urllib2 import (ProxyHandler, UnknownHandler, HTTPDefaultErrorHandler, 
-                     FTPHandler, FileHandler, HTTPErrorProcessor, HTTPHandler, 
-                     OpenerDirector, HTTPRedirectHandler)
+    from urllib2 import (ProxyHandler, UnknownHandler, HTTPDefaultErrorHandler, 
+                         FTPHandler, FileHandler, HTTPErrorProcessor, 
+                         HTTPHandler, OpenerDirector, HTTPRedirectHandler)
 
 from ndg.httpsclient.https import HTTPSContextHandler
 
@@ -36,7 +41,6 @@ def build_opener(*handlers, **kw):
     If any of the handlers passed as arguments are subclasses of the
     default handlers, the default handlers will not be used.
     """
-    import types
     def isclass(obj):
         return isinstance(obj, class_type_) or hasattr(obj, "__bases__")
 

ndg/httpsclient/utils.py

@@ -11,21 +11,29 @@
 import logging
 from optparse import OptionParser
 import os
-
-from urllib2 import (HTTPHandler, HTTPCookieProcessor, 
-                     HTTPBasicAuthHandler, HTTPPasswordMgrWithDefaultRealm)
+import sys
 
 if sys.version_info[0] > 2:
     import http.cookiejar as cookiejar_
     import http.client as http_client_
     from urllib.request import Request as Request_
+    from urllib.request import HTTPHandler as HTTPHandler_
+    from urllib.request import HTTPCookieProcessor as HTTPCookieProcessor_
+    from urllib.request import HTTPBasicAuthHandler as HTTPBasicAuthHandler_
+    from urllib.request import HTTPPasswordMgrWithDefaultRealm as \
+                                            HTTPPasswordMgrWithDefaultRealm_
     from urllib.request import ProxyHandler as ProxyHandler_
     from urllib.error import HTTPError as HTTPError_
     import urllib.parse as urlparse_
 else:
     import cookielib as cookiejar_
     import httplib as http_client_
     from urllib2 import Request as Request_
+    from urllib2 import HTTPHandler as HTTPHandler_
+    from urllib2 import HTTPCookieProcessor as HTTPCookieProcessor_
+    from urllib2 import HTTPBasicAuthHandler as HTTPBasicAuthHandler_
+    from urllib2 import HTTPPasswordMgrWithDefaultRealm as \
+                                            HTTPPasswordMgrWithDefaultRealm_
     from urllib2 import ProxyHandler as ProxyHandler_
     from urllib2 import HTTPError as HTTPError_
     import urlparse as urlparse_
@@ -36,7 +44,7 @@
 
 log = logging.getLogger(__name__)
 
-class AccumulatingHTTPCookieProcessor(HTTPCookieProcessor):
+class AccumulatingHTTPCookieProcessor(HTTPCookieProcessor_):
     """Cookie processor that adds new cookies (instead of replacing the existing
     ones as HTTPCookieProcessor does)
     """
@@ -171,14 +179,14 @@ def open_url(url, config, data=None, handlers=None):
     handlers.append(cookie_handler)
 
     if config.debug:
-        http_handler = HTTPHandler(debuglevel=debuglevel)
+        http_handler = HTTPHandler_(debuglevel=debuglevel)
         https_handler = HTTPSContextHandler(config.ssl_context, 
                                             debuglevel=debuglevel)
         handlers.extend([http_handler, https_handler])
 
     if config.http_basicauth:
         # currently only supports http basic auth
-        auth_handler = HTTPBasicAuthHandler(HTTPPasswordMgrWithDefaultRealm())
+        auth_handler = HTTPBasicAuthHandler_(HTTPPasswordMgrWithDefaultRealm_())
         auth_handler.add_password(realm=None, uri=url,
                                   user=config.httpauth[0],
                                   passwd=config.httpauth[1])
@@ -208,6 +216,10 @@ def open_url(url, config, data=None, handlers=None):
     return_code = 0
     return_message = ''
     response = None
+    
+    # FIXME
+    response = opener.open(request)
+
     try:
         response = opener.open(request)
         return_message = response.msg