Update patches
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python38?expand=0&rev=37
This commit is contained in:
parent
ed35b7a69f
commit
a4b422fc49
@ -130,7 +130,7 @@ Co-authored-by: Iryna Shcherbina <shcherbina.iryna@gmail.com>
|
|||||||
'data': '{userbase}',
|
'data': '{userbase}',
|
||||||
--- a/Lib/test/test_site.py
|
--- a/Lib/test/test_site.py
|
||||||
+++ b/Lib/test/test_site.py
|
+++ b/Lib/test/test_site.py
|
||||||
@@ -266,8 +266,8 @@ class HelperFunctionsTests(unittest.Test
|
@@ -267,8 +267,8 @@ class HelperFunctionsTests(unittest.Test
|
||||||
dirs = site.getsitepackages()
|
dirs = site.getsitepackages()
|
||||||
if os.sep == '/':
|
if os.sep == '/':
|
||||||
# OS X, Linux, FreeBSD, etc
|
# OS X, Linux, FreeBSD, etc
|
||||||
@ -183,7 +183,7 @@ Co-authored-by: Iryna Shcherbina <shcherbina.iryna@gmail.com>
|
|||||||
}
|
}
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -15188,9 +15188,9 @@ fi
|
@@ -15214,9 +15214,9 @@ fi
|
||||||
|
|
||||||
|
|
||||||
if test x$PLATFORM_TRIPLET = x; then
|
if test x$PLATFORM_TRIPLET = x; then
|
||||||
@ -197,7 +197,7 @@ Co-authored-by: Iryna Shcherbina <shcherbina.iryna@gmail.com>
|
|||||||
|
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -4674,9 +4674,9 @@ fi
|
@@ -4689,9 +4689,9 @@ fi
|
||||||
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
|
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
|
||||||
AC_SUBST(PY_ENABLE_SHARED)
|
AC_SUBST(PY_ENABLE_SHARED)
|
||||||
if test x$PLATFORM_TRIPLET = x; then
|
if test x$PLATFORM_TRIPLET = x; then
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -4671,12 +4671,26 @@ else
|
@@ -4686,12 +4686,26 @@ else
|
||||||
LIBPYTHON=''
|
LIBPYTHON=''
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -267,7 +267,7 @@
|
|||||||
addsitedir(sitedir, known_paths)
|
addsitedir(sitedir, known_paths)
|
||||||
--- a/Lib/test/test_site.py
|
--- a/Lib/test/test_site.py
|
||||||
+++ b/Lib/test/test_site.py
|
+++ b/Lib/test/test_site.py
|
||||||
@@ -266,8 +266,11 @@ class HelperFunctionsTests(unittest.Test
|
@@ -267,8 +267,11 @@ class HelperFunctionsTests(unittest.Test
|
||||||
dirs = site.getsitepackages()
|
dirs = site.getsitepackages()
|
||||||
if os.sep == '/':
|
if os.sep == '/':
|
||||||
# OS X, Linux, FreeBSD, etc
|
# OS X, Linux, FreeBSD, etc
|
||||||
@ -314,7 +314,7 @@
|
|||||||
# just making sure _main() runs and returns things in the stdout
|
# just making sure _main() runs and returns things in the stdout
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -15188,9 +15188,9 @@ fi
|
@@ -15214,9 +15214,9 @@ fi
|
||||||
|
|
||||||
|
|
||||||
if test x$PLATFORM_TRIPLET = x; then
|
if test x$PLATFORM_TRIPLET = x; then
|
||||||
@ -361,7 +361,7 @@
|
|||||||
import tempfile
|
import tempfile
|
||||||
import textwrap
|
import textwrap
|
||||||
|
|
||||||
@@ -1070,12 +1071,13 @@ class InitConfigTests(EmbeddingTestsMixi
|
@@ -1072,12 +1073,13 @@ class InitConfigTests(EmbeddingTestsMixi
|
||||||
return config['config']['module_search_paths']
|
return config['config']['module_search_paths']
|
||||||
else:
|
else:
|
||||||
ver = sys.version_info
|
ver = sys.version_info
|
||||||
@ -377,7 +377,7 @@
|
|||||||
f'python{ver.major}.{ver.minor}', 'lib-dynload'),
|
f'python{ver.major}.{ver.minor}', 'lib-dynload'),
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -1180,13 +1182,15 @@ class InitConfigTests(EmbeddingTestsMixi
|
@@ -1188,13 +1190,15 @@ class InitConfigTests(EmbeddingTestsMixi
|
||||||
def test_init_pyvenv_cfg(self):
|
def test_init_pyvenv_cfg(self):
|
||||||
# Test path configuration with pyvenv.cfg configuration file
|
# Test path configuration with pyvenv.cfg configuration file
|
||||||
|
|
||||||
|
@ -70,7 +70,7 @@ subsequent commits.
|
|||||||
class EncodingTest(unittest.TestCase):
|
class EncodingTest(unittest.TestCase):
|
||||||
"""Issue 6716: compileall should escape source code when printing errors
|
"""Issue 6716: compileall should escape source code when printing errors
|
||||||
to stdout."""
|
to stdout."""
|
||||||
@@ -579,6 +594,21 @@ class CommandLineTestsBase:
|
@@ -620,6 +635,21 @@ class CommandLineTestsBase:
|
||||||
|
|
||||||
|
|
||||||
class CommmandLineTestsWithSourceEpoch(CommandLineTestsBase,
|
class CommmandLineTestsWithSourceEpoch(CommandLineTestsBase,
|
||||||
@ -124,8 +124,8 @@ subsequent commits.
|
|||||||
|
|
||||||
--- a/Lib/test/test_py_compile.py
|
--- a/Lib/test/test_py_compile.py
|
||||||
+++ b/Lib/test/test_py_compile.py
|
+++ b/Lib/test/test_py_compile.py
|
||||||
@@ -216,5 +216,19 @@ class PyCompileTestsWithoutSourceEpoch(P
|
@@ -272,5 +272,19 @@ class PyCompileCLITestCase(unittest.Test
|
||||||
pass
|
self.assertIn(b'No such file or directory', stderr)
|
||||||
|
|
||||||
|
|
||||||
+class PyCompileTestsWithSourceEpoch(PyCompileTestsBase,
|
+class PyCompileTestsWithSourceEpoch(PyCompileTestsBase,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/Lib/test/test_subprocess.py
|
--- a/Lib/test/test_subprocess.py
|
||||||
+++ b/Lib/test/test_subprocess.py
|
+++ b/Lib/test/test_subprocess.py
|
||||||
@@ -1124,7 +1124,8 @@ class ProcessTestCase(BaseTestCase):
|
@@ -1125,7 +1125,8 @@ class ProcessTestCase(BaseTestCase):
|
||||||
self.assertIn("0.0001", str(c.exception)) # For coverage of __str__.
|
self.assertIn("0.0001", str(c.exception)) # For coverage of __str__.
|
||||||
# Some heavily loaded buildbots (sparc Debian 3.x) require this much
|
# Some heavily loaded buildbots (sparc Debian 3.x) require this much
|
||||||
# time to start.
|
# time to start.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user