Fix SSL verify_mode monkey-patching on Python 2.7

Author: alekstorm

hyper/http20/tls.py

@@ -20,6 +20,9 @@
 # to.
 _context = None
 
+# Exposed here so it can be monkey-patched in integration tests.
+_verify_mode = ssl.CERT_REQUIRED
+
 
 # Work out where our certificates are.
 cert_loc = path.join(path.dirname(__file__), '..', 'certs.pem')
@@ -45,7 +48,7 @@ def wrap_socket(socket, server_hostname):
 else:
     def wrap_socket(socket, server_hostname):
         return ssl.wrap_socket(socket, ssl_version=ssl.PROTOCOL_SSLv23,
-            ca_certs=cert_loc, cert_reqs=ssl.CERT_NONE) # FIXME CERT_REQUIRED
+            ca_certs=cert_loc, cert_reqs=_verify_mode)
 
 
 def _init_context():
@@ -55,7 +58,7 @@ def _init_context():
     context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
     context.set_default_verify_paths()
     context.load_verify_locations(cafile=cert_loc)
-    context.verify_mode = ssl.CERT_REQUIRED
+    context.verify_mode = _verify_mode
 
     try:
         context.set_npn_protocols(SUPPORTED_PROTOCOLS)

test/test_integration.py

@@ -8,11 +8,11 @@
 """
 import requests
 import ssl
-import sys
 import threading
 import hyper
 import pytest
 from hyper import HTTP20Connection
+from hyper.compat import is_py3
 from hyper.contrib import HTTP20Adapter
 from hyper.http20.frame import (
     Frame, SettingsFrame, WindowUpdateFrame, DataFrame, HeadersFrame,
@@ -27,9 +27,9 @@
 from server import SocketLevelTest
 
 # Turn off certificate verification for the tests.
-if sys.version_info[0] == 3:
+hyper.http20.tls._verify_mode = ssl.CERT_NONE
+if is_py3:
     hyper.http20.tls._context = hyper.http20.tls._init_context()
-    hyper.http20.tls._context.verify_mode = ssl.CERT_NONE
 
 def decode_frame(frame_data):
     f, length = Frame.parse_frame_header(frame_data[:8])