mirror of
https://github.com/python/cpython
synced 2024-09-05 16:38:56 +00:00
bpo-41304: Ensure python3x._pth is loaded on Windows (GH-21495)
This commit is contained in:
parent
af4eda46d1
commit
936a660945
|
@ -598,12 +598,19 @@ def test_startup_interactivehook_isolated_explicit(self):
|
||||||
@unittest.skipUnless(sys.platform == 'win32', "only supported on Windows")
|
@unittest.skipUnless(sys.platform == 'win32', "only supported on Windows")
|
||||||
class _pthFileTests(unittest.TestCase):
|
class _pthFileTests(unittest.TestCase):
|
||||||
|
|
||||||
def _create_underpth_exe(self, lines):
|
def _create_underpth_exe(self, lines, exe_pth=True):
|
||||||
|
import _winapi
|
||||||
temp_dir = tempfile.mkdtemp()
|
temp_dir = tempfile.mkdtemp()
|
||||||
self.addCleanup(test.support.rmtree, temp_dir)
|
self.addCleanup(test.support.rmtree, temp_dir)
|
||||||
exe_file = os.path.join(temp_dir, os.path.split(sys.executable)[1])
|
exe_file = os.path.join(temp_dir, os.path.split(sys.executable)[1])
|
||||||
|
dll_src_file = _winapi.GetModuleFileName(sys.dllhandle)
|
||||||
|
dll_file = os.path.join(temp_dir, os.path.split(dll_src_file)[1])
|
||||||
shutil.copy(sys.executable, exe_file)
|
shutil.copy(sys.executable, exe_file)
|
||||||
_pth_file = os.path.splitext(exe_file)[0] + '._pth'
|
shutil.copy(dll_src_file, dll_file)
|
||||||
|
if exe_pth:
|
||||||
|
_pth_file = os.path.splitext(exe_file)[0] + '._pth'
|
||||||
|
else:
|
||||||
|
_pth_file = os.path.splitext(dll_file)[0] + '._pth'
|
||||||
with open(_pth_file, 'w') as f:
|
with open(_pth_file, 'w') as f:
|
||||||
for line in lines:
|
for line in lines:
|
||||||
print(line, file=f)
|
print(line, file=f)
|
||||||
|
@ -671,5 +678,30 @@ def test_underpth_file(self):
|
||||||
self.assertTrue(rc, "sys.path is incorrect")
|
self.assertTrue(rc, "sys.path is incorrect")
|
||||||
|
|
||||||
|
|
||||||
|
def test_underpth_dll_file(self):
|
||||||
|
libpath = os.path.dirname(os.path.dirname(encodings.__file__))
|
||||||
|
exe_prefix = os.path.dirname(sys.executable)
|
||||||
|
exe_file = self._create_underpth_exe([
|
||||||
|
'fake-path-name',
|
||||||
|
*[libpath for _ in range(200)],
|
||||||
|
'',
|
||||||
|
'# comment',
|
||||||
|
'import site'
|
||||||
|
], exe_pth=False)
|
||||||
|
sys_prefix = os.path.dirname(exe_file)
|
||||||
|
env = os.environ.copy()
|
||||||
|
env['PYTHONPATH'] = 'from-env'
|
||||||
|
env['PATH'] = '{};{}'.format(exe_prefix, os.getenv('PATH'))
|
||||||
|
rc = subprocess.call([exe_file, '-c',
|
||||||
|
'import sys; sys.exit(not sys.flags.no_site and '
|
||||||
|
'%r in sys.path and %r in sys.path and %r not in sys.path and '
|
||||||
|
'all("\\r" not in p and "\\n" not in p for p in sys.path))' % (
|
||||||
|
os.path.join(sys_prefix, 'fake-path-name'),
|
||||||
|
libpath,
|
||||||
|
os.path.join(sys_prefix, 'from-env'),
|
||||||
|
)], env=env)
|
||||||
|
self.assertTrue(rc, "sys.path is incorrect")
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Fixes `python3x._pth` being ignored on Windows
|
|
@ -669,7 +669,7 @@ static int
|
||||||
get_pth_filename(PyCalculatePath *calculate, wchar_t *filename,
|
get_pth_filename(PyCalculatePath *calculate, wchar_t *filename,
|
||||||
const _PyPathConfig *pathconfig)
|
const _PyPathConfig *pathconfig)
|
||||||
{
|
{
|
||||||
if (get_dllpath(filename) &&
|
if (!get_dllpath(filename) &&
|
||||||
!change_ext(filename, filename, L"._pth") &&
|
!change_ext(filename, filename, L"._pth") &&
|
||||||
exists(filename))
|
exists(filename))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue