Merge pull request #79 from t2y/development

Fxied to call _send_cb() instead of _data_cb() for PingFrame Thanks to @t2y!
python-hyper · Jan 24, 2015 · 7978b2a · 7978b2a
2 parents e530d18 + 0fa1d68
commit 7978b2a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/hyper/http20/connection.py b/hyper/http20/connection.py
@@ -339,7 +339,7 @@ def receive_frame(self, frame):
                 p = PingFrame(0)
                 p.flags.add('ACK')
                 p.opaque_data = frame.opaque_data
-                self._data_cb(p, True)
+                self._send_cb(p, True)
         elif frame.type == SettingsFrame.type:
             if 'ACK' not in frame.flags:
                 self._update_settings(frame)

diff --git a/test/test_hyper.py b/test/test_hyper.py
@@ -1273,7 +1273,7 @@ def test_ping_with_ack_ignored(self):
 
         def data_cb(frame, tolerate_peer_gone=False):
             assert False, 'should not be called'
-        c._data_cb = data_cb
+        c._send_cb = data_cb
         c.receive_frame(f)
 
     def test_ping_without_ack_gets_reply(self):
@@ -1285,7 +1285,7 @@ def test_ping_without_ack_gets_reply(self):
 
         def data_cb(frame, tolerate_peer_gone=False):
             frames.append(frame)
-        c._data_cb = data_cb
+        c._send_cb = data_cb
         c.receive_frame(f)
 
         assert len(frames) == 1