diff --git a/python3/Lib/distutils/sysconfig.py b/python3/Lib/distutils/sysconfig.py index 03b85584..a279ac86 100644 --- a/python3/Lib/distutils/sysconfig.py +++ b/python3/Lib/distutils/sysconfig.py @@ -334,7 +334,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): if standard_lib: return libpython else: - return os.path.join(libpython, "site-packages") + return os.path.join(prefix, libdir, "python3", "site-packages") elif os.name == "nt": if standard_lib: return os.path.join(prefix, "Lib") diff --git a/python3/Lib/site.py b/python3/Lib/site.py index 69670d9d..15e11fdd 100644 --- a/python3/Lib/site.py +++ b/python3/Lib/site.py @@ -295,7 +295,7 @@ def _get_path(userbase): if sys.platform == 'darwin' and sys._framework: return f'{userbase}/lib/python/site-packages' - return f'{userbase}/lib/python{version[0]}.{version[1]}/site-packages' + return f'{userbase}/lib/python{version[0]}/site-packages' def getuserbase(): @@ -368,7 +368,7 @@ def getsitepackages(prefixes=None): for libdir in libdirs: path = os.path.join(prefix, libdir, - "python%d.%d" % sys.version_info[:2], + "python%d" % sys.version_info[:1], "site-packages") sitepackages.append(path) else: diff --git a/python3/Lib/sysconfig.py b/python3/Lib/sysconfig.py index ebe37118..d19ab885 100644 --- a/python3/Lib/sysconfig.py +++ b/python3/Lib/sysconfig.py @@ -27,8 +27,8 @@ _INSTALL_SCHEMES = { 'posix_prefix': { 'stdlib': '{installed_base}/{platlibdir}/python{py_version_short}', 'platstdlib': '{platbase}/{platlibdir}/python{py_version_short}', - 'purelib': '{base}/lib/python{py_version_short}/site-packages', - 'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages', + 'purelib': '{base}/lib/python3/site-packages', + 'platlib': '{platbase}/{platlibdir}/python3/site-packages', 'include': '{installed_base}/include/python{py_version_short}{abiflags}', 'platinclude': @@ -76,8 +76,8 @@ _INSTALL_SCHEMES = { 'posix_venv': { 'stdlib': '{installed_base}/{platlibdir}/python{py_version_short}', 'platstdlib': '{platbase}/{platlibdir}/python{py_version_short}', - 'purelib': '{base}/lib/python{py_version_short}/site-packages', - 'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages', + 'purelib': '{base}/lib/python3/site-packages', + 'platlib': '{platbase}/{platlibdir}/python3/site-packages', 'include': '{installed_base}/include/python{py_version_short}{abiflags}', 'platinclude': @@ -145,8 +145,8 @@ if _HAS_USER_BASE: 'posix_user': { 'stdlib': '{userbase}/{platlibdir}/python{py_version_short}', 'platstdlib': '{userbase}/{platlibdir}/python{py_version_short}', - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', - 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', + 'purelib': '{userbase}/lib/python3/site-packages', + 'platlib': '{userbase}/lib/python3/site-packages', 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data': '{userbase}', diff --git a/python3/Lib/test/test_site.py b/python3/Lib/test/test_site.py index b5dc381a..6c9abcc1 100644 --- a/python3/Lib/test/test_site.py +++ b/python3/Lib/test/test_site.py @@ -288,13 +288,13 @@ class HelperFunctionsTests(unittest.TestCase): if sys.platlibdir != "lib": self.assertEqual(len(dirs), 2) wanted = os.path.join('xoxo', sys.platlibdir, - 'python%d.%d' % sys.version_info[:2], + 'python%d' % sys.version_info[:1], 'site-packages') self.assertEqual(dirs[0], wanted) else: self.assertEqual(len(dirs), 1) wanted = os.path.join('xoxo', 'lib', - 'python%d.%d' % sys.version_info[:2], + 'python%d' % sys.version_info[:1], 'site-packages') self.assertEqual(dirs[-1], wanted) else: diff --git a/python3/Lib/test/test_sysconfig.py b/python3/Lib/test/test_sysconfig.py index d96371d2..ea1594a0 100644 --- a/python3/Lib/test/test_sysconfig.py +++ b/python3/Lib/test/test_sysconfig.py @@ -147,7 +147,7 @@ class TestSysConfig(unittest.TestCase): binpath = 'bin' incpath = 'include' libpath = os.path.join('lib', - 'python%d.%d' % sys.version_info[:2], + 'python%d' % sys.version_info[:1], 'site-packages') # Resolve the paths in prefix @@ -377,7 +377,7 @@ class TestSysConfig(unittest.TestCase): # Replace "/lib64/python3.11/site-packages" suffix # with "/lib/python3.11/site-packages". py_version_short = sysconfig.get_python_version() - suffix = f'python{py_version_short}/site-packages' + suffix = f'python3/site-packages' expected = expected.replace(f'/{sys.platlibdir}/{suffix}', f'/lib/{suffix}') self.assertEqual(user_path, expected) diff --git a/python3/Lib/test/test_venv.py b/python3/Lib/test/test_venv.py index 86ce60fe..3b0e27ad 100644 --- a/python3/Lib/test/test_venv.py +++ b/python3/Lib/test/test_venv.py @@ -67,7 +67,7 @@ class BaseTest(unittest.TestCase): self.include = 'Include' else: self.bindir = 'bin' - self.lib = ('lib', 'python%d.%d' % sys.version_info[:2]) + self.lib = ('lib', 'python%d' % sys.version_info[:1]) self.include = 'include' executable = sys._base_executable self.exe = os.path.split(executable)[-1] @@ -311,8 +311,8 @@ class BasicTest(BaseTest): ('bin',), ('include',), ('lib',), - ('lib', 'python%d.%d' % sys.version_info[:2]), - ('lib', 'python%d.%d' % sys.version_info[:2], 'site-packages'), + ('lib', 'python%d' % sys.version_info[:1]), + ('lib', 'python%d' % sys.version_info[:1], 'site-packages'), ) def create_contents(self, paths, filename): @@ -553,7 +553,7 @@ class BasicTest(BaseTest): bindir = os.path.join(non_installed_dir, self.bindir) os.mkdir(bindir) shutil.copy2(sys.executable, bindir) - libdir = os.path.join(non_installed_dir, platlibdir, self.lib[1]) + libdir = os.path.join(non_installed_dir, platlibdir, "python%d.%d" % sys.version_info[:2]) os.makedirs(libdir) landmark = os.path.join(libdir, "os.py") stdlib_zip = "python%d%d.zip" % sys.version_info[:2]