Move H2C_PROTOCOL declaration

Author: fredthomsen

hyper/http11/connection.py

@@ -11,14 +11,13 @@
 import base64
 
 from .response import HTTP11Response
-from ..tls import wrap_socket
+from ..tls import wrap_socket, H2C_PROTOCOL
 from ..common.bufsocket import BufferedSocket
 from ..common.exceptions import TLSUpgrade, HTTPUpgrade
 from ..common.headers import HTTPHeaderMap
 from ..common.util import to_bytestring
 from ..compat import bytes
 
-from ..http20.connection import H2C_PROTOCOL
 from ..packages.hyperframe.frame import SettingsFrame
 
 # We prefer pycohttpparser to the pure-Python interpretation

hyper/http20/connection.py

@@ -5,7 +5,7 @@
 
 Objects that build hyper's connection-level HTTP/2 abstraction.
 """
-from ..tls import wrap_socket, H2_NPN_PROTOCOLS
+from ..tls import wrap_socket, H2_NPN_PROTOCOLS, H2C_PROTOCOL
 from ..common.exceptions import ConnectionResetError
 from ..common.bufsocket import BufferedSocket
 from ..common.headers import HTTPHeaderMap
@@ -25,8 +25,6 @@
 import logging
 import socket
 
-H2C_PROTOCOL = 'h2c'
-
 log = logging.getLogger(__name__)
 
 class HTTP20Connection(object):

hyper/tls.py

@@ -14,6 +14,7 @@
 H2_NPN_PROTOCOLS = [NPN_PROTOCOL, 'h2-16', 'h2-15', 'h2-14']
 SUPPORTED_NPN_PROTOCOLS = H2_NPN_PROTOCOLS + ['http/1.1']
 
+H2C_PROTOCOL = 'h2c'
 
 # We have a singleton SSLContext object. There's no reason to be creating one
 # per connection.