Pass _send_outstanding_data instead of _send_cb to stream constructor and adjust call in stream accordingly

fredthomsen · fredthomsen · commit cb8619942f31 · 2016-06-08T07:09:45.000-04:00
diff --git a/hyper/http20/connection.py b/hyper/http20/connection.py
@@ -577,7 +577,7 @@ def _new_stream(self, stream_id=None, local_closed=False):
                 stream_id or self.next_stream_id,
                 self.__wm_class(DEFAULT_WINDOW_SIZE),
                 self._conn,
-                self._send_cb,
+                self._send_outstanding_data,
                 self._recv_cb,
                 self._stream_close_cb,
             )
diff --git a/hyper/http20/stream.py b/hyper/http20/stream.py
@@ -96,7 +96,7 @@ def send_headers(self, end_stream=False):
         headers = self.get_headers()
         with self._conn as conn:
             conn.send_headers(self.stream_id, headers, end_stream)
-            self._send_cb(conn.data_to_send())
+        self._send_cb()
 
         if end_stream:
             self.local_closed = True
@@ -191,7 +191,7 @@ def receive_data(self, event):
                 conn.increment_flow_control_window(
                     increment, stream_id=self.stream_id
                 )
-                self._send_cb(conn.data_to_send())
+            self._send_cb()
 
     def receive_end_stream(self, event):
         """
@@ -280,16 +280,18 @@ def close(self, error_code=None):
         # FIXME: I think this is overbroad, but for now it's probably ok.
         if not (self.remote_closed and self.local_closed):
             with self._conn as conn:
+                send = False
+
                 try:
                     conn.reset_stream(self.stream_id, error_code or 0)
                 except h2.exceptions.ProtocolError:
-                    # If for any reason we can't reset the stream, just tolerate
-                    # it.
+                    # If for any reason we can't reset the stream, just
+                    # tolerate it.
                     pass
                 else:
-                    self._send_cb(
-                        conn.data_to_send(), tolerate_peer_gone=True
-                    )
+                    send = True
+            if send:
+                self._send_cb(tolerate_peer_gone=True)
             self.remote_closed = True
             self.local_closed = True
 
@@ -329,7 +331,7 @@ def _send_chunk(self, data, final):
             conn.send_data(
                 stream_id=self.stream_id, data=data, end_stream=end_stream
             )
-            self._send_cb(conn.data_to_send())
+        self._send_cb()
 
         if end_stream:
             self.local_closed = True

Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ def _new_stream(self, stream_id=None, local_closed=False):`
`577`	`577`	`stream_id or self.next_stream_id,`
`578`	`578`	`self.__wm_class(DEFAULT_WINDOW_SIZE),`
`579`	`579`	`self._conn,`
`580`		`- self._send_cb,`
	`580`	`+ self._send_outstanding_data,`
`581`	`581`	`self._recv_cb,`
`582`	`582`	`self._stream_close_cb,`
`583`	`583`	`)`