- Adjust location of the test breakpoint in Lib/test/test_pdb.py,

because we have shortened Lib/pdb.py by removing the shebang

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python310?expand=0&rev=24

pdb_adjust_breakpoints.patch

@@ -1,15 +0,0 @@
----
- Lib/test/test_pdb.py |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/Lib/test/test_pdb.py
-+++ b/Lib/test/test_pdb.py
-@@ -362,7 +362,7 @@ def test_pdb_breakpoints_preserved_acros
-     1   breakpoint   keep yes   at ...test_pdb.py:...
-     2   breakpoint   keep yes   at ...test_pdb.py:...
-     (Pdb) break pdb.find_function
--    Breakpoint 3 at ...pdb.py:94
-+    Breakpoint 3 at ...pdb.py:93
-     (Pdb) break
-     Num Type         Disp Enb   Where
-     1   breakpoint   keep yes   at ...test_pdb.py:...

python310.changes

@@ -1,8 +1,8 @@
 -------------------------------------------------------------------
 Thu Dec  2 13:51:57 UTC 2021 - Matej Cepl <mcepl@suse.com>
 
-- Add pdb_adjust_breakpoints.patch fixing expectd results in
-  test_pdb_breakpoints_preserved_across_interactive_sessions
+- Adjust location of the test breakpoint in Lib/test/test_pdb.py,
+  because we have shortened Lib/pdb.py by removing the shebang
   (bpo#45964).
 
 -------------------------------------------------------------------

python310.spec

@@ -146,9 +146,6 @@ Patch33:        no-skipif-doctests.patch
 # PATCH-FIX-SLE skip-test_pyobject_freed_is_freed.patch mcepl@suse.com
 # skip a test failing on SLE-15
 Patch34:        skip-test_pyobject_freed_is_freed.patch
-# PATCH-FIX-UPSTREAM pdb_adjust_breakpoints.patch bugno mcepl@suse.com
-# adjust results of a doctest
-Patch35:        pdb_adjust_breakpoints.patch
 BuildRequires:  autoconf-archive
 BuildRequires:  automake
 BuildRequires:  fdupes
@@ -402,7 +399,6 @@ other applications.
 %if 0%{?sle_version} && 0%{?sle_version} <= 150300
 %patch34 -p1
 %endif
-%patch35 -p1
 
 # drop Autoconf version requirement
 sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac
@@ -422,6 +418,8 @@ done
 for dir in Lib Tools; do
     find $dir -name '*.py' -type f -exec sed -i '1{/^#!.*python/ d}' '{}' \;
 done
+# We shortened the file Lib/pdb.py so we have to move the test breakpoint location
+sed -i -e '/Breakpoint 3 at ...pdb.py:94/s/94/93/' Lib/test/test_pdb.py
 %endif
 
 # drop in-tree libffi and expat