From e45492d41f80b8b3021613025ab0709b22985558 Mon Sep 17 00:00:00 2001 From: Dash Date: Sun, 23 Feb 2020 14:34:29 -0500 Subject: [PATCH 1/3] bumped version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 94cd8d21..e28b3a62 100644 --- a/setup.py +++ b/setup.py @@ -77,7 +77,7 @@ def run_tests(self): 'Programming Language :: Python :: Implementation :: CPython', ], install_requires=[ - 'h2>=2.4,<3.0,!=2.5.0', 'hyperframe>=3.2,<4.0', 'rfc3986>=1.1.0,<2.0', 'brotlipy>=0.7.0,<1.0' + 'h2>=2.4,<3.0,!=2.5.0', 'hyperframe>=3.2,<6.0', 'rfc3986>=1.1.0,<2.0', 'brotlipy>=0.7.0,<1.0' ], tests_require=['pytest', 'requests', 'mock'], cmdclass={'test': PyTest}, From be10823a6b6fa22d14cb7768fca1d309353ddb32 Mon Sep 17 00:00:00 2001 From: Fernando Hernandez Date: Thu, 19 Mar 2020 20:17:19 -0300 Subject: [PATCH 2/3] Support for latest h2 version --- hyper/http20/connection.py | 4 ++-- setup.py | 2 +- test/test_hyper.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hyper/http20/connection.py b/hyper/http20/connection.py index b8be292b..d2805a09 100644 --- a/hyper/http20/connection.py +++ b/hyper/http20/connection.py @@ -403,7 +403,7 @@ def _connect_upgrade(self, sock): with self._conn as conn: conn.initiate_upgrade_connection() conn.update_settings( - {h2.settings.ENABLE_PUSH: int(self._enable_push)} + {h2.settings.SettingCodes.ENABLE_PUSH: int(self._enable_push)} ) self._send_outstanding_data() @@ -424,7 +424,7 @@ def _send_preamble(self): with self._conn as conn: conn.initiate_connection() conn.update_settings( - {h2.settings.ENABLE_PUSH: int(self._enable_push)} + {h2.settings.SettingCodes.ENABLE_PUSH: int(self._enable_push)} ) self._send_outstanding_data() diff --git a/setup.py b/setup.py index 94cd8d21..7da02a83 100644 --- a/setup.py +++ b/setup.py @@ -77,7 +77,7 @@ def run_tests(self): 'Programming Language :: Python :: Implementation :: CPython', ], install_requires=[ - 'h2>=2.4,<3.0,!=2.5.0', 'hyperframe>=3.2,<4.0', 'rfc3986>=1.1.0,<2.0', 'brotlipy>=0.7.0,<1.0' + 'h2>=3', 'rfc3986>=1.1.0,<2.0', 'brotlipy>=0.7.0,<1.0' ], tests_require=['pytest', 'requests', 'mock'], cmdclass={'test': PyTest}, diff --git a/test/test_hyper.py b/test/test_hyper.py index b826c63c..a842525d 100644 --- a/test/test_hyper.py +++ b/test/test_hyper.py @@ -766,7 +766,7 @@ def test_incrementing_window_after_close(self): # the default max frame size (16,384 bytes). That will, on the third # frame, trigger the processing to increment the flow control window, # which should then not happen. - f = SettingsFrame(0, settings={h2.settings.INITIAL_WINDOW_SIZE: 100}) + f = SettingsFrame(0, settings={h2.settings.SettingCodes.INITIAL_WINDOW_SIZE: 100}) c = HTTP20Connection('www.google.com') c._sock = DummySocket() From 75ae37587700bdc68db5b3660312eaa3deeb90ad Mon Sep 17 00:00:00 2001 From: Dash Winterson Date: Mon, 27 Jul 2020 04:41:56 -0400 Subject: [PATCH 3/3] fixed pylint error --- test/test_hyper.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test_hyper.py b/test/test_hyper.py index a842525d..b938fd7e 100644 --- a/test/test_hyper.py +++ b/test/test_hyper.py @@ -766,7 +766,8 @@ def test_incrementing_window_after_close(self): # the default max frame size (16,384 bytes). That will, on the third # frame, trigger the processing to increment the flow control window, # which should then not happen. - f = SettingsFrame(0, settings={h2.settings.SettingCodes.INITIAL_WINDOW_SIZE: 100}) + s = {h2.settings.SettingCodes.INITIAL_WINDOW_SIZE: 100} + f = SettingsFrame(0, settings=s) c = HTTP20Connection('www.google.com') c._sock = DummySocket()