Move common objects to common code.

Author: Lukasa

hyper/http20/bufsocket.py hyper/common/bufsocket.pyhyper/http20/bufsocket.py renamed to hyper/common/bufsocket.py

@@ -17,3 +17,28 @@ class InvalidResponseError(Exception):
     A problem was found with the response that makes it invalid.
     """
     pass
+
+
+class SocketError(Exception):
+    """
+    An error occurred during socket operation.
+    """
+    pass
+
+
+class LineTooLongError(Exception):
+    """
+    An attempt to read a line from a socket failed because no newline was
+    found.
+    """
+    pass
+
+
+# Create our own ConnectionResetError.
+try:  # pragma: no cover
+    ConnectionResetError = ConnectionResetError
+except NameError:  # pragma: no cover
+    class ConnectionResetError(Exception):
+        """
+        A HTTP connection was unexpectedly reset.
+        """

hyper/common/exceptions.py

@@ -11,7 +11,7 @@
 
 from .response import HTTP11Response
 from ..tls import wrap_socket
-from ..http20.bufsocket import BufferedSocket
+from ..common.bufsocket import BufferedSocket
 from ..common.headers import HTTPHeaderMap
 from ..common.util import to_bytestring
 from ..compat import bytes

hyper/http11/connection.py

@@ -12,7 +12,7 @@
 
 from ..common.decoder import DeflateDecoder
 from ..common.exceptions import ChunkedDecodeError, InvalidResponseError
-from ..http20.exceptions import ConnectionResetError
+from ..common.exceptions import ConnectionResetError
 
 log = logging.getLogger(__name__)
 

hyper/http11/response.py

@@ -6,6 +6,8 @@
 Objects that build hyper's connection-level HTTP/2 abstraction.
 """
 from ..tls import wrap_socket, H2_NPN_PROTOCOLS
+from ..common.exceptions import ConnectionResetError
+from ..common.bufsocket import BufferedSocket
 from .hpack_compat import Encoder, Decoder
 from .stream import Stream
 from .frame import (
@@ -15,8 +17,7 @@
 )
 from .response import HTTP20Response, HTTP20Push
 from .window import FlowControlManager
-from .exceptions import ConnectionError, ConnectionResetError
-from .bufsocket import BufferedSocket
+from .exceptions import ConnectionError
 
 import errno
 import logging

hyper/http20/connection.py

@@ -5,20 +5,6 @@
 
 This defines exceptions used in the HTTP/2 portion of hyper.
 """
-class SocketError(Exception):
-    """
-    An error occurred during socket operation.
-    """
-    pass
-
-
-class LineTooLongError(Exception):
-    """
-    An attempt to read a line from a socket failed because no newline was
-    found.
-    """
-    pass
-
 
 class HTTP20Error(Exception):
     """
@@ -54,13 +40,3 @@ class ProtocolError(HTTP20Error):
     The remote party violated the HTTP/2 protocol.
     """
     pass
-
-
-# Create our own ConnectionResetError.
-try:  # pragma: no cover
-    ConnectionResetError = ConnectionResetError
-except NameError:  # pragma: no cover
-    class ConnectionResetError(Exception):
-        """
-        A HTTP/2 connection was unexpectedly reset.
-        """

hyper/http20/exceptions.py

@@ -17,9 +17,8 @@
 import hyper
 from hyper.http11.connection import HTTP11Connection
 from hyper.http11.response import HTTP11Response
-from hyper.http20.exceptions import ConnectionResetError
 from hyper.common.headers import HTTPHeaderMap
-from hyper.common.exceptions import ChunkedDecodeError
+from hyper.common.exceptions import ChunkedDecodeError, ConnectionResetError
 from hyper.compat import bytes, zlib_compressobj
 
 

test/test_http11.py

@@ -7,9 +7,9 @@
 """
 import pytest
 
-import hyper.http20.bufsocket
-from hyper.http20.bufsocket import BufferedSocket
-from hyper.http20.exceptions import ConnectionResetError, LineTooLongError
+import hyper.common.bufsocket
+from hyper.common.bufsocket import BufferedSocket
+from hyper.common.exceptions import ConnectionResetError, LineTooLongError
 
 # Patch the select method in bufsocket to make sure that it always returns
 # the dummy socket as readable.
@@ -22,7 +22,7 @@ class TestBufferedSocket(object):
     """
     def test_can_create_buffered_sockets(self, monkeypatch):
         monkeypatch.setattr(
-            hyper.http20.bufsocket.select, 'select', dummy_select
+            hyper.common.bufsocket.select, 'select', dummy_select
         )
         s = DummySocket()
         b = BufferedSocket(s)
@@ -32,7 +32,7 @@ def test_can_create_buffered_sockets(self, monkeypatch):
 
     def test_can_send_on_buffered_socket(self, monkeypatch):
         monkeypatch.setattr(
-            hyper.http20.bufsocket.select, 'select', dummy_select
+            hyper.common.bufsocket.select, 'select', dummy_select
         )
         s = DummySocket()
         b = BufferedSocket(s)
@@ -43,7 +43,7 @@ def test_can_send_on_buffered_socket(self, monkeypatch):
 
     def test_receive_single_packet(self, monkeypatch):
         monkeypatch.setattr(
-            hyper.http20.bufsocket.select, 'select', dummy_select
+            hyper.common.bufsocket.select, 'select', dummy_select
         )
         s = DummySocket()
         b = BufferedSocket(s)
@@ -54,7 +54,7 @@ def test_receive_single_packet(self, monkeypatch):
 
     def test_receive_multiple_packets_one_at_a_time(self, monkeypatch):
         monkeypatch.setattr(
-            hyper.http20.bufsocket.select, 'select', dummy_select
+            hyper.common.bufsocket.select, 'select', dummy_select
         )
         s = DummySocket()
         b = BufferedSocket(s)
@@ -68,7 +68,7 @@ def test_receive_multiple_packets_one_at_a_time(self, monkeypatch):
 
     def test_receive_small_packets(self, monkeypatch):
         monkeypatch.setattr(
-            hyper.http20.bufsocket.select, 'select', dummy_select
+            hyper.common.bufsocket.select, 'select', dummy_select
         )
         s = DummySocket()
         b = BufferedSocket(s)
@@ -82,7 +82,7 @@ def test_receive_small_packets(self, monkeypatch):
 
     def test_receive_multiple_packets_at_once(self, monkeypatch):
         monkeypatch.setattr(
-            hyper.http20.bufsocket.select, 'select', dummy_select
+            hyper.common.bufsocket.select, 'select', dummy_select
         )
         s = DummySocket()
         b = BufferedSocket(s)
@@ -97,7 +97,7 @@ def test_receive_multiple_packets_at_once(self, monkeypatch):
 
     def test_filling_the_buffer(self, monkeypatch):
         monkeypatch.setattr(
-            hyper.http20.bufsocket.select, 'select', dummy_select
+            hyper.common.bufsocket.select, 'select', dummy_select
         )
         s = DummySocket()
         b = BufferedSocket(s)
@@ -114,7 +114,7 @@ def test_filling_the_buffer(self, monkeypatch):
 
     def test_oversized_read(self, monkeypatch):
         monkeypatch.setattr(
-            hyper.http20.bufsocket.select, 'select', dummy_select
+            hyper.common.bufsocket.select, 'select', dummy_select
         )
         s = DummySocket()
         b = BufferedSocket(s)
@@ -125,7 +125,7 @@ def test_oversized_read(self, monkeypatch):
 
     def test_readline_from_buffer(self, monkeypatch):
         monkeypatch.setattr(
-            hyper.http20.bufsocket.select, 'select', dummy_select
+            hyper.common.bufsocket.select, 'select', dummy_select
         )
         s = DummySocket()
         b = BufferedSocket(s)
@@ -143,7 +143,7 @@ def test_readline_from_buffer(self, monkeypatch):
 
     def test_readline_from_socket(self, monkeypatch):
         monkeypatch.setattr(
-            hyper.http20.bufsocket.select, 'select', dummy_select
+            hyper.common.bufsocket.select, 'select', dummy_select
         )
         s = DummySocket()
         b = BufferedSocket(s)
@@ -162,7 +162,7 @@ def test_readline_from_socket(self, monkeypatch):
 
     def test_readline_both(self, monkeypatch):
         monkeypatch.setattr(
-            hyper.http20.bufsocket.select, 'select', dummy_select
+            hyper.common.bufsocket.select, 'select', dummy_select
         )
         s = DummySocket()
         b = BufferedSocket(s)
@@ -186,7 +186,7 @@ def test_readline_both(self, monkeypatch):
 
     def test_socket_error_on_readline(self, monkeypatch):
         monkeypatch.setattr(
-            hyper.http20.bufsocket.select, 'select', dummy_select
+            hyper.common.bufsocket.select, 'select', dummy_select
         )
         s = DummySocket()
         b = BufferedSocket(s)
@@ -196,7 +196,7 @@ def test_socket_error_on_readline(self, monkeypatch):
 
     def test_socket_readline_too_long(self, monkeypatch):
         monkeypatch.setattr(
-            hyper.http20.bufsocket.select, 'select', dummy_select
+            hyper.common.bufsocket.select, 'select', dummy_select
         )
         s = DummySocket()
         b = BufferedSocket(s)