]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Revert "gh-103224: Use the realpath of the Python executable in `test_venv` (GH-10324...
authorSerhiy Storchaka <storchaka@gmail.com>
Wed, 30 Aug 2023 08:41:04 +0000 (11:41 +0300)
committerGitHub <noreply@github.com>
Wed, 30 Aug 2023 08:41:04 +0000 (11:41 +0300)
This reverts commit 85b0b0cd947c5218260fb2bc2014c8c8de172d33.

It broke builtbots.

Lib/test/test_venv.py

index 3d19b2b2e905f3e401c410547308f50880fe2d02..5205604c2c7185168c86bfd3d657f652decf3130 100644 (file)
@@ -208,8 +208,7 @@ class BasicTest(BaseTest):
     def test_upgrade_dependencies(self):
         builder = venv.EnvBuilder()
         bin_path = 'Scripts' if sys.platform == 'win32' else 'bin'
-        python_exe_realpath = os.path.realpath(sys._base_executable)
-        python_exe = os.path.split(python_exe_realpath)[1]
+        python_exe = os.path.split(sys.executable)[1]
         with tempfile.TemporaryDirectory() as fake_env_dir:
             expect_exe = os.path.normcase(
                 os.path.join(fake_env_dir, bin_path, python_exe)
@@ -552,8 +551,7 @@ class BasicTest(BaseTest):
         self.addCleanup(rmtree, non_installed_dir)
         bindir = os.path.join(non_installed_dir, self.bindir)
         os.mkdir(bindir)
-        python_exe_realpath = os.path.realpath(sys._base_executable)
-        shutil.copy2(python_exe_realpath, bindir)
+        shutil.copy2(sys.executable, bindir)
         libdir = os.path.join(non_installed_dir, platlibdir, self.lib[1])
         os.makedirs(libdir)
         landmark = os.path.join(libdir, "os.py")
@@ -597,7 +595,7 @@ class BasicTest(BaseTest):
         # libpython.so
         ld_library_path = sysconfig.get_config_var("LIBDIR")
         if not ld_library_path or sysconfig.is_python_build():
-            ld_library_path = os.path.abspath(os.path.dirname(python_exe_realpath))
+            ld_library_path = os.path.abspath(os.path.dirname(sys.executable))
         if sys.platform == 'darwin':
             ld_library_path_env = "DYLD_LIBRARY_PATH"
         else: