From dd2454694f077b1ca800b2e3aef248fa6ed7b2d3 Mon Sep 17 00:00:00 2001
From: wk333 <13474090681@163.com>
Date: Sun, 23 Jul 2023 17:59:58 +0800
Subject: [PATCH] Fix repr checks for Python 3.11

---
 Fix-repr-checks-for-Python-3.11.patch | 109 ++++++++++++++++++++++++++
 python-h2.spec                        |   6 +-
 2 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 Fix-repr-checks-for-Python-3.11.patch

diff --git a/Fix-repr-checks-for-Python-3.11.patch b/Fix-repr-checks-for-Python-3.11.patch
new file mode 100644
index 0000000..685f8f8
--- /dev/null
+++ b/Fix-repr-checks-for-Python-3.11.patch
@@ -0,0 +1,109 @@
+From eabe727282e7a7aa3254773292f86cf341bdc597 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Sun, 3 Jul 2022 12:05:05 +0200
+Subject: [PATCH] Fix repr() checks for Python 3.11
+
+In Python 3.11, repr() was modified, this commit fixes the
+assertions to match the new repr() behavior.
+
+Fix #1268
+
+Origin: https://github.com/python-hyper/h2/pull/1274
+---
+ test/test_events.py | 62 ++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 44 insertions(+), 18 deletions(-)
+
+diff --git a/test/test_events.py b/test/test_events.py
+index a6e8d8379..c790fbaa0 100644
+--- a/test/test_events.py
++++ b/test/test_events.py
+@@ -207,11 +207,18 @@ def test_remotesettingschanged_repr(self):
+                 ),
+         }
+ 
+-        assert repr(e) == (
+-            "<RemoteSettingsChanged changed_settings:{ChangedSetting("
+-            "setting=SettingCodes.INITIAL_WINDOW_SIZE, original_value=65536, "
+-            "new_value=32768)}>"
+-        )
++        if sys.version_info >= (3, 11):
++            assert repr(e) == (
++                "<RemoteSettingsChanged changed_settings:{ChangedSetting("
++                "setting=4, original_value=65536, "
++                "new_value=32768)}>"
++            )
++        else:
++            assert repr(e) == (
++                "<RemoteSettingsChanged changed_settings:{ChangedSetting("
++                "setting=SettingCodes.INITIAL_WINDOW_SIZE, original_value=65536, "
++                "new_value=32768)}>"
++            )
+ 
+     def test_pingreceived_repr(self):
+         """
+@@ -249,10 +256,16 @@ def test_streamreset_repr(self):
+         e.error_code = h2.errors.ErrorCodes.ENHANCE_YOUR_CALM
+         e.remote_reset = False
+ 
+-        assert repr(e) == (
+-            "<StreamReset stream_id:919, "
+-            "error_code:ErrorCodes.ENHANCE_YOUR_CALM, remote_reset:False>"
+-        )
++        if sys.version_info >= (3, 11):
++            assert repr(e) == (
++                "<StreamReset stream_id:919, "
++                "error_code:11, remote_reset:False>"
++            )
++        else:
++            assert repr(e) == (
++                "<StreamReset stream_id:919, "
++                "error_code:ErrorCodes.ENHANCE_YOUR_CALM, remote_reset:False>"
++            )
+ 
+     def test_pushedstreamreceived_repr(self):
+         """
+@@ -284,11 +297,18 @@ def test_settingsacknowledged_repr(self):
+                 ),
+         }
+ 
+-        assert repr(e) == (
+-            "<SettingsAcknowledged changed_settings:{ChangedSetting("
+-            "setting=SettingCodes.INITIAL_WINDOW_SIZE, original_value=65536, "
+-            "new_value=32768)}>"
+-        )
++        if sys.version_info >= (3, 11):
++            assert repr(e) == (
++                "<SettingsAcknowledged changed_settings:{ChangedSetting("
++                "setting=4, original_value=65536, "
++                "new_value=32768)}>"
++            )
++        else:
++            assert repr(e) == (
++                "<SettingsAcknowledged changed_settings:{ChangedSetting("
++                "setting=SettingCodes.INITIAL_WINDOW_SIZE, original_value=65536, "
++                "new_value=32768)}>"
++            )
+ 
+     def test_priorityupdated_repr(self):
+         """
+@@ -318,10 +338,16 @@ def test_connectionterminated_repr(self, additional_data, data_repr):
+         e.last_stream_id = 33
+         e.additional_data = additional_data
+ 
+-        assert repr(e) == (
+-            "<ConnectionTerminated error_code:ErrorCodes.INADEQUATE_SECURITY, "
+-            "last_stream_id:33, additional_data:%s>" % data_repr
+-        )
++        if sys.version_info >= (3, 11):
++            assert repr(e) == (
++                "<ConnectionTerminated error_code:12, "
++                "last_stream_id:33, additional_data:%s>" % data_repr
++            )
++        else:
++            assert repr(e) == (
++                "<ConnectionTerminated error_code:ErrorCodes.INADEQUATE_SECURITY, "
++                "last_stream_id:33, additional_data:%s>" % data_repr
++            )
+ 
+     def test_alternativeserviceavailable_repr(self):
+         """
diff --git a/python-h2.spec b/python-h2.spec
index bd61b37..dc0df15 100644
--- a/python-h2.spec
+++ b/python-h2.spec
@@ -1,10 +1,11 @@
 Name:           python-h2
 Version:        4.1.0
-Release:        1
+Release:        2
 Summary:        A HTTP/2 protocol stack for Python
 License:        MIT
 URL:            https://python-hyper.org/projects/hyper-h2/en/v4.1.0/
 Source0:        https://files.pythonhosted.org/packages/2a/32/fec683ddd10629ea4ea46d206752a95a2d8a48c22521edd70b142488efe1/h2-4.1.0.tar.gz
+Patch0:         Fix-repr-checks-for-Python-3.11.patch
 BuildArch:      noarch
 
 BuildRequires:  (python3dist(hpack) >= 4 with python3dist(hpack) < 5)
@@ -71,6 +72,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib}  %{__python3} -m pytest
 %doc html LICENSE
 
 %changelog
+* Sun Jul 23 2023 wangkai <13474090681@163.com> - 4.1.0-2
+- Fix repr checks for Python 3.11
+
 * Thu Dec 01 2022 dingdingaaaaa <dingziwei@kylinos.cn> - 4.1.0-1
 - upgrade version to 4.1.0