Move TLS module up a level.

Author: Lukasa

hyper/http20/connection.py

@@ -5,9 +5,9 @@
 
 Objects that build hyper's connection-level HTTP/2 abstraction.
 """
+from ..tls import wrap_socket
 from .hpack_compat import Encoder, Decoder
 from .stream import Stream
-from .tls import wrap_socket
 from .frame import (
     FRAMES, DataFrame, HeadersFrame, PushPromiseFrame, RstStreamFrame,
     SettingsFrame, Frame, WindowUpdateFrame, GoAwayFrame, PingFrame,

hyper/http20/tls.py hyper/tls.pyhyper/http20/tls.py renamed to hyper/tls.py

@@ -7,7 +7,7 @@
 """
 import os.path as path
 
-from ..compat import ignore_missing, ssl
+from .compat import ignore_missing, ssl
 
 
 NPN_PROTOCOL = 'h2'
@@ -20,7 +20,7 @@
 _context = None
 
 # Work out where our certificates are.
-cert_loc = path.join(path.dirname(__file__), '..', 'certs.pem')
+cert_loc = path.join(path.dirname(__file__), 'certs.pem')
 
 def wrap_socket(sock, server_hostname):
     """

test/server.py

@@ -23,7 +23,7 @@
 from hyper.http20.huffman_constants import (
     REQUEST_CODES, REQUEST_CODES_LENGTH
 )
-from hyper.http20.tls import NPN_PROTOCOL
+from hyper.tls import NPN_PROTOCOL
 
 class SocketServerThread(threading.Thread):
     """

test/test_integration.py

@@ -26,9 +26,9 @@
 
 # Turn off certificate verification for the tests.
 if ssl is not None:
-    hyper.http20.tls._context = hyper.http20.tls._init_context()
-    hyper.http20.tls._context.check_hostname = False
-    hyper.http20.tls._context.verify_mode = ssl.CERT_NONE
+    hyper.tls._context = hyper.tls._init_context()
+    hyper.tls._context.check_hostname = False
+    hyper.tls._context.verify_mode = ssl.CERT_NONE
 
 def decode_frame(frame_data):
     f, length = Frame.parse_frame_header(frame_data[:9])