diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2022-01-30 13:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-30 13:15:20 -0500 |
| commit | b53a824ec34b75d8f267f9ec8bf152bfea2e3edb (patch) | |
| tree | b9fe12535d65866999986e5023f73b28de7184e3 /distutils/command | |
| parent | 4471eeeb8510cb7de367219ad50d8221735dc701 (diff) | |
| parent | 917046dc70da8c6c5ba87571b0864826085e3659 (diff) | |
| download | python-setuptools-git-b53a824ec34b75d8f267f9ec8bf152bfea2e3edb.tar.gz | |
Merge pull request #113 from zooba/issue112
Fixes #112 install command doesn't use platform in nt_user scheme
Diffstat (limited to 'distutils/command')
| -rw-r--r-- | distutils/command/install.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/distutils/command/install.py b/distutils/command/install.py index 511938f4..9fe65913 100644 --- a/distutils/command/install.py +++ b/distutils/command/install.py @@ -68,8 +68,8 @@ if HAS_USER_SITE: INSTALL_SCHEMES['nt_user'] = { 'purelib': '{usersite}', 'platlib': '{usersite}', - 'headers': '{userbase}/{implementation}{py_version_nodot}/Include/{dist_name}', - 'scripts': '{userbase}/{implementation}{py_version_nodot}/Scripts', + 'headers': '{userbase}/{implementation}{py_version_nodot_plat}/Include/{dist_name}', + 'scripts': '{userbase}/{implementation}{py_version_nodot_plat}/Scripts', 'data' : '{userbase}', } @@ -412,12 +412,18 @@ class install(Command): 'implementation': _get_implementation(), } + # vars for compatibility on older Pythons + compat_vars = dict( + # Python 3.9 and earlier + py_version_nodot_plat=getattr(sys, 'winver', '').replace('.', ''), + ) + if HAS_USER_SITE: local_vars['userbase'] = self.install_userbase local_vars['usersite'] = self.install_usersite self.config_vars = _collections.DictStack( - [sysconfig.get_config_vars(), local_vars]) + [compat_vars, sysconfig.get_config_vars(), local_vars]) self.expand_basedirs() |