mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

bpo-45582: Fix getpath_isxfile() and test_embed on Windows (GH-29930)

Browse source
This commit is contained in:
neonene 2021-12-07 02:25:19 +09:00 • committed by GitHub
parent 612e59b53f
commit af1db4eb55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/test/test_embed.py
View file

@ -575,7 +575,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
return configs return configs
def get_expected_config(self, expected_preconfig, expected, def get_expected_config(self, expected_preconfig, expected,
env, api, modify_path_cb=None): env, api, modify_path_cb=None, cwd=None):
configs = self._get_expected_config() configs = self._get_expected_config()
pre_config = configs['pre_config'] pre_config = configs['pre_config']
@ -618,6 +618,14 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
expected['base_executable'] = default_executable expected['base_executable'] = default_executable
if expected['program_name'] is self.GET_DEFAULT_CONFIG: if expected['program_name'] is self.GET_DEFAULT_CONFIG:
expected['program_name'] = './_testembed' expected['program_name'] = './_testembed'
if MS_WINDOWS:
# follow the calculation in getpath.py
tmpname = expected['program_name'] + '.exe'
if cwd:
tmpname = os.path.join(cwd, tmpname)
if os.path.isfile(tmpname):
expected['program_name'] += '.exe'
del tmpname
config = configs['config'] config = configs['config']
for key, value in expected.items(): for key, value in expected.items():
@ -711,7 +719,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
self.get_expected_config(expected_preconfig, self.get_expected_config(expected_preconfig,
expected_config, expected_config,
env, env,
api, modify_path_cb) api, modify_path_cb, cwd)
out, err = self.run_embedded_interpreter(testname, out, err = self.run_embedded_interpreter(testname,
env=env, cwd=cwd) env=env, cwd=cwd)

2
Modules/getpath.c
View file

@ -230,7 +230,7 @@ getpath_isxfile(PyObject *Py_UNUSED(self), PyObject *args)
DWORD attr = GetFileAttributesW(path); DWORD attr = GetFileAttributesW(path);
r = (attr != INVALID_FILE_ATTRIBUTES) && r = (attr != INVALID_FILE_ATTRIBUTES) &&
!(attr & FILE_ATTRIBUTE_DIRECTORY) && !(attr & FILE_ATTRIBUTE_DIRECTORY) &&
SUCCEEDED(PathCchFindExtension(path, cchPath, &ext)) && SUCCEEDED(PathCchFindExtension(path, cchPath + 1, &ext)) &&
(CompareStringOrdinal(ext, -1, L".exe", -1, 1 /* ignore case */) == CSTR_EQUAL) (CompareStringOrdinal(ext, -1, L".exe", -1, 1 /* ignore case */) == CSTR_EQUAL)
? Py_True : Py_False; ? Py_True : Py_False;
#else #else