Clean up connection objects better when closed.

Connections need to be reset to their basic state when they get
closed, in order to enable their reuse.

Author: Lukasa

hyper/http20/connection.py

@@ -48,6 +48,25 @@ def __init__(self, host, port=None, **kwargs):
         else:
             self.host, self.port = host, port
 
+        # Create the mutable state.
+        self.__init_state()
+
+        return
+
+    def __init_state(self):
+        """
+        Initializes the 'mutable state' portions of the HTTP/2.0 connection
+        object.
+
+        This method exists to enable HTTP20Connection objects to be reused if
+        they're closed, by resetting the connection object to its basic state
+        whenever it ends up closed. Any situation that needs to recreate the
+        connection can call this method and it will be done.
+
+        This is one of the only methods in hyper that is truly private, as
+        users should be strongly discouraged from messing about with connection
+        objects themselves.
+        """
         # Streams are stored in a dictionary keyed off their stream IDs. We
         # also save the most recent one for easy access without having to walk
         # the dictionary.
@@ -156,7 +175,7 @@ def close(self):
         # do.
         if self._sock is not None:
             self._sock.close()
-            self._sock = None
+            self.__init_state()
 
     def putrequest(self, method, selector, **kwargs):
         """

test/test_hyper.py

@@ -821,6 +821,26 @@ def test_putrequest_sends_data(self):
         assert len(sock.queue) == 2
         assert c._out_flow_control_window == 65535 - len(b'hello')
 
+    def test_closed_connections_are_reset(self):
+        c = HTTP20Connection('www.google.com')
+        c._sock = DummySocket()
+        encoder = c.encoder
+        decoder = c.decoder
+        c.request('GET', '/')
+        c.close()
+
+        assert c._sock is None
+        assert not c.streams
+        assert c.recent_stream is None
+        assert c.next_stream_id == 1
+        assert c.encoder is not encoder
+        assert c.decoder is not decoder
+        assert c._settings == {
+            SettingsFrame.INITIAL_WINDOW_SIZE: 65535,
+        }
+        assert c._out_flow_control_window == 65535
+        assert c._in_flow_control_window == 65535
+
 
 class TestHyperStream(object):
     def test_streams_have_ids(self):
@@ -1077,6 +1097,9 @@ def send(self, data):
     def recv(self, l):
         return self.buffer.read(l)
 
+    def close(self):
+        pass
+
 class DummyStream(object):
     def __init__(self, data):
         self.data = data