diff --git a/Lib/shutil.py b/Lib/shutil.py
index 5bcfa563fea9af..a278b74fab2ddb 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -481,7 +481,7 @@ def _copytree(entries, src, dst, symlinks, ignore, copy_function,
if ignore is not None:
ignored_names = ignore(os.fspath(src), [x.name for x in entries])
else:
- ignored_names = set()
+ ignored_names = ()
os.makedirs(dst, exist_ok=dirs_exist_ok)
errors = []
diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
index 7cfea548ee2180..56d562d0b068dd 100644
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -747,11 +747,13 @@ def set_temp_dir(self):
if sysconfig.is_python_build():
self.tmp_dir = sysconfig.get_config_var('abs_builddir')
if self.tmp_dir is None:
- # gh-74470: On Windows, only srcdir is available. Using
- # abs_builddir mostly matters on UNIX when building Python
- # out of the source tree, especially when the source tree
- # is read only.
- self.tmp_dir = sysconfig.get_config_var('srcdir')
+ self.tmp_dir = sysconfig.get_config_var('abs_srcdir')
+ if not self.tmp_dir:
+ # gh-74470: On Windows, only srcdir is available. Using
+ # abs_builddir mostly matters on UNIX when building
+ # Python out of the source tree, especially when the
+ # source tree is read only.
+ self.tmp_dir = sysconfig.get_config_var('srcdir')
self.tmp_dir = os.path.join(self.tmp_dir, 'build')
else:
self.tmp_dir = tempfile.gettempdir()
diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
index 860c4cc4e0a818..1ec04de3c0c94f 100644
--- a/Lib/test/pythoninfo.py
+++ b/Lib/test/pythoninfo.py
@@ -516,6 +516,8 @@ def collect_sysconfig(info_add):
'Py_ENABLE_SHARED',
'SHELL',
'SOABI',
+ 'abs_builddir',
+ 'abs_srcdir',
'prefix',
):
value = sysconfig.get_config_var(name)
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index d3b2922d9b0ad1..b9b05fc4306a31 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -767,12 +767,27 @@ def recursive_function(depth):
#self.assertEqual(available, 2)
def test_copy_python_src_ignore(self):
- src_dir = sysconfig.get_config_var('srcdir')
+ # Get source directory
+ src_dir = sysconfig.get_config_var('abs_srcdir')
+ if not src_dir:
+ src_dir = sysconfig.get_config_var('srcdir')
src_dir = os.path.abspath(src_dir)
- ignored = {'.git', '__pycache__'}
+ # Check that the source code is available
+ if not os.path.exists(src_dir):
+ self.skipTest(f"cannot access Python source code directory:"
+ f" {src_dir!r}")
+ # Check that the landmark copy_python_src_ignore() expects is available
+ # (Previously we looked for 'Lib\os.py', which is always present on Windows.)
+ landmark = os.path.join(src_dir, 'Modules')
+ if not os.path.exists(landmark):
+ self.skipTest(f"cannot access Python source code directory:"
+ f" {landmark!r} landmark is missing")
+
+ # Test support.copy_python_src_ignore()
# Source code directory
+ ignored = {'.git', '__pycache__'}
names = os.listdir(src_dir)
self.assertEqual(support.copy_python_src_ignore(src_dir, names),
ignored | {'build'})
@@ -782,7 +797,7 @@ def test_copy_python_src_ignore(self):
self.assertEqual(support.copy_python_src_ignore(path, os.listdir(path)),
ignored | {'build', 'venv'})
- # An other directory
+ # Another directory
path = os.path.join(src_dir, 'Objects')
self.assertEqual(support.copy_python_src_ignore(path, os.listdir(path)),
ignored)
diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index 6942bf246b61d1..fea16568afebae 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -571,7 +571,11 @@ def test_zippath_from_non_installed_posix(self):
eachpath,
os.path.join(non_installed_dir, platlibdir))
elif os.path.isfile(os.path.join(eachpath, "os.py")):
- for name in os.listdir(eachpath):
+ names = os.listdir(eachpath)
+ ignored_names = copy_python_src_ignore(eachpath, names)
+ for name in names:
+ if name in ignored_names:
+ continue
if name == "site-packages":
continue
fn = os.path.join(eachpath, name)
diff --git a/Tools/freeze/test/freeze.py b/Tools/freeze/test/freeze.py
index bb15941464e3d1..cdf77c57bbb6ae 100644
--- a/Tools/freeze/test/freeze.py
+++ b/Tools/freeze/test/freeze.py
@@ -7,9 +7,16 @@
from test import support
+def get_python_source_dir():
+ src_dir = sysconfig.get_config_var('abs_srcdir')
+ if not src_dir:
+ src_dir = sysconfig.get_config_var('srcdir')
+ return os.path.abspath(src_dir)
+
+
TESTS_DIR = os.path.dirname(__file__)
TOOL_ROOT = os.path.dirname(TESTS_DIR)
-SRCDIR = os.path.abspath(sysconfig.get_config_var('srcdir'))
+SRCDIR = get_python_source_dir()
MAKE = shutil.which('make')
FREEZE = os.path.join(TOOL_ROOT, 'freeze.py')
diff --git a/Tools/patchcheck/patchcheck.py b/Tools/patchcheck/patchcheck.py
index fa3a43af6e6048..e3959ce428c7c5 100755
--- a/Tools/patchcheck/patchcheck.py
+++ b/Tools/patchcheck/patchcheck.py
@@ -11,6 +11,13 @@
import untabify
+def get_python_source_dir():
+ src_dir = sysconfig.get_config_var('abs_srcdir')
+ if not src_dir:
+ src_dir = sysconfig.get_config_var('srcdir')
+ return os.path.abspath(src_dir)
+
+
# Excluded directories which are copies of external libraries:
# don't check their coding style
EXCLUDE_DIRS = [
@@ -18,7 +25,7 @@
os.path.join('Modules', 'expat'),
os.path.join('Modules', 'zlib'),
]
-SRCDIR = sysconfig.get_config_var('srcdir')
+SRCDIR = get_python_source_dir()
def n_files_str(count):
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy