Merge pull request #267 from Lukasa/closed-stream-windows

Fixup opening windows of closed streams.

Author: Lukasa

.travis.yml

@@ -34,7 +34,6 @@ script:
           py.test test/
         else
           coverage run -m py.test test/
-          coverage combine
           coverage report
         fi
       fi

hyper/http20/stream.py

@@ -186,14 +186,19 @@ def receive_data(self, event):
         # Append the data to the buffer.
         self.data.append(event.data)
 
-        stream_about_to_close = (event.stream_ended is not None)
-
-        if increment and not self.remote_closed and not stream_about_to_close:
-            with self._conn as conn:
-                conn.increment_flow_control_window(
-                    increment, stream_id=self.stream_id
-                )
-            self._send_outstanding_data()
+        if increment:
+            try:
+                with self._conn as conn:
+                    conn.increment_flow_control_window(
+                        increment, stream_id=self.stream_id
+                    )
+            except h2.exceptions.StreamClosedError:
+                # We haven't got to it yet, but the stream is already
+                # closed. We don't need to increment the window in this
+                # case!
+                pass
+            else:
+                self._send_outstanding_data()
 
     def receive_end_stream(self, event):
         """

tox.ini

@@ -5,7 +5,6 @@ envlist = py27, py34, py35, pypy, lint
 deps= -r{toxinidir}/test_requirements.txt
 commands=
     coverage run -m py.test {toxinidir}/test/
-    coverage combine
     coverage report
 
 [testenv:pypy]