From a0fa395bc68b9798154a0a99347ce71db7586c74 Mon Sep 17 00:00:00 2001
From: shixuantong <shixuantong1@huawei.com>
Date: Thu, 27 Jul 2023 20:07:03 +0800
Subject: [PATCH] Adjust tests for a last minute Python 3.11 change in the
 traceback format

---
 ...for-a-last-minute-Python-3.11-change.patch | 97 +++++++++++++++++++
 python-cffi.spec                              |  6 +-
 2 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 backport-Adjust-tests-for-a-last-minute-Python-3.11-change.patch

diff --git a/backport-Adjust-tests-for-a-last-minute-Python-3.11-change.patch b/backport-Adjust-tests-for-a-last-minute-Python-3.11-change.patch
new file mode 100644
index 0000000..b9b7762
--- /dev/null
+++ b/backport-Adjust-tests-for-a-last-minute-Python-3.11-change.patch
@@ -0,0 +1,97 @@
+From 8a3c2c816d789639b49d3ae867213393ed7abdff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Fri, 15 Jul 2022 16:11:37 +0200
+Subject: [PATCH] Adjust tests for a last minute Python 3.11 change in the
+ traceback format
+
+Reference:https://foss.heptapod.net/pypy/cffi/-/commit/8a3c2c816
+
+See https://github.com/python/cpython/issues/93883
+and https://github.com/python/cpython/pull/93994
+
+--HG--
+branch : python3.11.0b4
+---
+ c/test_c.py | 35 ++---------------------------------
+ 1 file changed, 2 insertions(+), 33 deletions(-)
+
+diff --git a/c/test_c.py b/c/test_c.py
+index cde83b80..048711c7 100644
+--- a/c/test_c.py
++++ b/c/test_c.py
+@@ -1342,11 +1342,11 @@ def test_callback_exception():
+     except ImportError:
+         import io as cStringIO    # Python 3
+     import linecache
+-    def matches(istr, ipattern, ipattern38, ipattern311):
++    def matches(istr, ipattern, ipattern38, ipattern311=None):
+         if sys.version_info >= (3, 8):
+             ipattern = ipattern38
+         if sys.version_info >= (3, 11):
+-            ipattern = ipattern311
++            ipattern = ipattern311 or ipattern38
+         str, pattern = istr, ipattern
+         while '$' in pattern:
+             i = pattern.index('$')
+@@ -1400,16 +1400,6 @@ Traceback (most recent call last):
+   File "$", line $, in check_value
+     $
+ ValueError: 42
+-""", """\
+-Exception ignored from cffi callback <function$Zcb1 at 0x$>:
+-Traceback (most recent call last):
+-  File "$", line $, in Zcb1
+-    $
+-    $
+-  File "$", line $, in check_value
+-    $
+-    $
+-ValueError: 42
+ """)
+         sys.stderr = cStringIO.StringIO()
+         bigvalue = 20000
+@@ -1424,13 +1414,6 @@ Traceback (most recent call last):
+   File "$", line $, in test_callback_exception
+     $
+ OverflowError: integer 60000 does not fit 'short'
+-""", """\
+-Exception ignored from cffi callback <function$Zcb1 at 0x$>, trying to convert the result back to C:
+-Traceback (most recent call last):
+-  File "$", line $, in test_callback_exception
+-    $
+-    $
+-OverflowError: integer 60000 does not fit 'short'
+ """)
+         sys.stderr = cStringIO.StringIO()
+         bigvalue = 20000
+@@ -1479,19 +1462,6 @@ Traceback (most recent call last):
+   File "$", line $, in test_callback_exception
+     $
+ TypeError: $integer$
+-""", """\
+-Exception ignored from cffi callback <function$Zcb1 at 0x$>, trying to convert the result back to C:
+-Traceback (most recent call last):
+-  File "$", line $, in test_callback_exception
+-    $
+-    $
+-OverflowError: integer 60000 does not fit 'short'
+-Exception ignored during handling of the above exception by 'onerror':
+-Traceback (most recent call last):
+-  File "$", line $, in test_callback_exception
+-    $
+-    $
+-TypeError: $integer$
+ """)
+         #
+         sys.stderr = cStringIO.StringIO()
+@@ -1526,7 +1496,6 @@ Exception ignored from cffi callback <function$Zcb1 at 0x$>, trying to convert t
+ Traceback (most recent call last):
+   File "$", line $, in test_callback_exception
+     $
+-    $
+ OverflowError: integer 60000 does not fit 'short'
+ Exception ignored during handling of the above exception by 'onerror':
+ Traceback (most recent call last):
+-- 
+GitLab
+
diff --git a/python-cffi.spec b/python-cffi.spec
index b69a070..2badcf4 100644
--- a/python-cffi.spec
+++ b/python-cffi.spec
@@ -6,12 +6,13 @@ based on C-like declarations that you can often copy-paste from header files or
 
 Name:		python-%{_name}
 Version:	1.15.1
-Release:	2
+Release:	3
 Summary:	%{_summary}
 License:	MIT
 URL:		http://cffi.readthedocs.org
 Source0:	https://files.pythonhosted.org/packages/source/c/cffi/%{_name}-%{version}.tar.gz
 
+Patch6000:      backport-Adjust-tests-for-a-last-minute-Python-3.11-change.patch
 
 Buildrequires:  libffi-devel gcc-c++ gcc python3-sphinx
 
@@ -54,6 +55,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -m pytest c/ testing/
 %doc PKG-INFO README.md
 
 %changelog
+* Thu Jul 27 2023 shixuantong <shixuantong1@huawei.com> - 1.15.1-3
+- Adjust tests for a last minute Python 3.11 change in the traceback format
+
 * Sat Jul 08 2023 shixuantong <shixuantong1@huawei.com> - 1.15.1-2
 - add python3-py to buildrequire
 
-- 
Gitee