Cleanup close logic.

Author: Lukasa

hyper/http20/connection.py

@@ -547,7 +547,10 @@ def _stream_close_cb(self, stream_id):
         """
         Called by a stream when it is closing, so that state can be cleared.
         """
-        del self.streams[stream_id]
+        try:
+            del self.streams[stream_id]
+        except KeyError:
+            pass
 
     # The following two methods are the implementation of the context manager
     # protocol.

hyper/http20/response.py

@@ -129,6 +129,10 @@ def read(self, amt=None, decode_content=True):
             if self._stream.response_headers:
                 self.headers.merge(self._stream.response_headers)
 
+        # We're at the end, close the connection.
+        if response_complete:
+            self.close()
+
         return data
 
     def read_chunked(self, decode_content=True):
@@ -155,6 +159,8 @@ def read_chunked(self, decode_content=True):
         if decode_content and self._decompressobj:
             yield self._decompressobj.flush()
 
+        self.close()
+
         return
 
     def fileno(self):

hyper/http20/stream.py

@@ -286,12 +286,10 @@ def close(self, error_code=None):
         :param error_code: (optional) The error code to reset the stream with.
         :returns: Nothing.
         """
-        if not self.local_closed:
-            self._conn.end_stream(self.stream_id)
-        else:
+        if not self.remote_closed:
             self._conn.reset_stream(self.stream_id, error_code or 0)
+            self._send_cb(self._conn.data_to_send())
 
-        self._send_cb(self._conn.data_to_send())
         self._close_cb(self.stream_id)
 
     @property