Source: pypy3 Version: 7.3.16+dfsg-2 Followup-For: Bug #1072016 I got stuck trying to refresh the debian/ensurepip-wheels patch, but could refresh some earlier patches. Most were applied automatically anyway and just needed to be acknowledged (all do look fine), a few needed trivial manual work -- still, a few steps less in porting:
---
debian/patches/stdlib/locale-module | 4 +---
debian/patches/stdlib/rlcompleter-invalidterminal | 8 +++-----
debian/patches/tests/skip-test_multiprocessing | 4 +---
debian/patches/tests/test_fsync-eatmydata | 4 +---
debian/patches/tests/test_readline-invalidterminal | 14 ++++++--------
5 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/debian/patches/stdlib/locale-module
b/debian/patches/stdlib/locale-module
index 0c8772f2..f788b60d 100644
--- a/debian/patches/stdlib/locale-module
+++ b/debian/patches/stdlib/locale-module
@@ -12,11 +12,9 @@ Last-Update: 2011-12-19
lib-python/3/locale.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/lib-python/3/locale.py b/lib-python/3/locale.py
-index 1a4e9f6..dfcfba5 100644
--- a/lib-python/3/locale.py
+++ b/lib-python/3/locale.py
-@@ -1409,8 +1409,8 @@ locale_alias = {
+@@ -1415,8 +1415,8 @@
'ug_cn': 'ug_CN.UTF-8',
'uk': 'uk_UA.KOI8-U',
'uk_ua': 'uk_UA.KOI8-U',
diff --git a/debian/patches/stdlib/rlcompleter-invalidterminal
b/debian/patches/stdlib/rlcompleter-invalidterminal
index 3b7fed76..755ee294 100644
--- a/debian/patches/stdlib/rlcompleter-invalidterminal
+++ b/debian/patches/stdlib/rlcompleter-invalidterminal
@@ -10,19 +10,17 @@ Forwarded: https://github.com/pypy/pypy/issues/3308
lib-python/3/rlcompleter.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
-diff --git a/lib-python/3/rlcompleter.py b/lib-python/3/rlcompleter.py
-index 923f5c0..5a440c1 100644
--- a/lib-python/3/rlcompleter.py
+++ b/lib-python/3/rlcompleter.py
-@@ -32,6 +32,7 @@ Notes:
- import atexit
+@@ -33,6 +33,7 @@
import builtins
+ import inspect
import __main__
+from pyrepl.unix_console import InvalidTerminal
__all__ = ["Completer"]
-@@ -76,11 +77,13 @@ class Completer:
+@@ -77,11 +78,13 @@
if not text.strip():
if state == 0:
if _readline_available:
diff --git a/debian/patches/tests/skip-test_multiprocessing
b/debian/patches/tests/skip-test_multiprocessing
index c3804900..5947de3b 100644
--- a/debian/patches/tests/skip-test_multiprocessing
+++ b/debian/patches/tests/skip-test_multiprocessing
@@ -10,8 +10,6 @@ Last-Updated: 2015-02-11
lib-python/3/test/_test_multiprocessing.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
-diff --git a/lib-python/3/test/_test_multiprocessing.py
b/lib-python/3/test/_test_multiprocessing.py
-index c00f21c..21c0c09 100644
--- a/lib-python/3/test/_test_multiprocessing.py
+++ b/lib-python/3/test/_test_multiprocessing.py
@@ -1,8 +1,10 @@
@@ -25,4 +23,4 @@ index c00f21c..21c0c09 100644
+ 'Disabled for now')
import unittest.mock
import queue as pyqueue
- import time
+ import textwrap
diff --git a/debian/patches/tests/test_fsync-eatmydata
b/debian/patches/tests/test_fsync-eatmydata
index 0b354c2e..c44489ba 100644
--- a/debian/patches/tests/test_fsync-eatmydata
+++ b/debian/patches/tests/test_fsync-eatmydata
@@ -8,11 +8,9 @@ Last-Update: 2012-02-06
lib-python/3/test/test_os.py | 2 ++
1 file changed, 2 insertions(+)
-diff --git a/lib-python/3/test/test_os.py b/lib-python/3/test/test_os.py
-index 3146d1a..fde22b5 100644
--- a/lib-python/3/test/test_os.py
+++ b/lib-python/3/test/test_os.py
-@@ -1972,6 +1972,8 @@ class TestInvalidFD(unittest.TestCase):
+@@ -2114,6 +2114,8 @@
except OSError as e:
self.assertEqual(e.errno, errno.EBADF)
else:
diff --git a/debian/patches/tests/test_readline-invalidterminal
b/debian/patches/tests/test_readline-invalidterminal
index c4190716..35c15b98 100644
--- a/debian/patches/tests/test_readline-invalidterminal
+++ b/debian/patches/tests/test_readline-invalidterminal
@@ -11,19 +11,17 @@ Forwarded: https://github.com/pypy/pypy/issues/3308
lib-python/3/test/test_readline.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
-diff --git a/lib-python/3/test/test_readline.py
b/lib-python/3/test/test_readline.py
-index f711ba8..c8e4815 100644
--- a/lib-python/3/test/test_readline.py
+++ b/lib-python/3/test/test_readline.py
-@@ -10,6 +10,7 @@ import subprocess
+@@ -10,6 +10,7 @@
import sys
import tempfile
import unittest
+from pyrepl.unix_console import InvalidTerminal
- from test.support import import_module, unlink, temp_dir, TESTFN, verbose
- from test.support.script_helper import assert_python_ok
-
-@@ -45,7 +46,10 @@ class TestHistoryManipulation (unittest.TestCase):
+ from test.support import verbose
+ from test.support.import_helper import import_module
+ from test.support.os_helper import unlink, temp_dir, TESTFN
+@@ -47,7 +48,10 @@
"""
def testHistoryUpdates(self):
@@ -35,7 +33,7 @@ index f711ba8..c8e4815 100644
readline.add_history("first line")
readline.add_history("second line")
-@@ -107,7 +111,10 @@ class TestHistoryManipulation (unittest.TestCase):
+@@ -116,7 +120,10 @@
readline.write_history_file(hfilename)
def test_nonascii_history(self):
--
2.43.0
signature.asc
Description: PGP signature
