Skip to content

Commit c8bd006

Browse files
committed
distutils-init
1 parent 48bd269 commit c8bd006

File tree

2 files changed

+67
-48
lines changed

2 files changed

+67
-48
lines changed

src/virtualenv.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2225,29 +2225,29 @@ def convert(s):
22252225
# file distutils-init.py
22262226
DISTUTILS_INIT = convert(
22272227
"""
2228-
eJytV1uL4zYUfvevOE0ottuMW9q3gVDa3aUMXXbLMlDKMBiNrSTqOJKRlMxkf33PkXyRbGe7Dw2E
2229-
UXTu37lpxLFV2oIyifAncxmOL0xLIfcG+gv80x9VW6maw7o/CANSWWBwFtqeWMPlGY6qPjV8A0bB
2230-
C4eKSTgZ5LRgFeyErMEeOBhbN+Ipgeizhjtnhkn7DdyjuNLPoCS0l/ayQTG0djwZC08cLXozeMss
2231-
aG5EzQ0IScpnWtHSTXuxByV/QCmxE7y+eS0uxWeoheaVVfqSJHiU7Mhhi6gULbOHorshkrEnKxpT
2232-
0n3A8Y8SMpuwZx6aoix3ouFlmW8gHRSkeSJ2g7hU+kiHLDaQw3bmRDaTGfTnty7gPm0FHbIBg9U9
2233-
oh1kZzAFLaue2R6htPCtAda2nGlDSUJ4PZBgCJBGVcwKTAMz/vJiLD+Oin5Z5QlvDPdulC6EsiyE
2234-
NFzb7McNTKJzbJqzphx92VKRFY1idenzmq3K0emRcbWBD0ryqc4NZGmKOOOX9Pz5x+/l27tP797c
2235-
f/z0d+4NruGNai8uAM0bfsYaw8itFk8ny41jsfpyO+BWlpqfhcG4yxLdi/0tQqoT4a8Vby382mt8
2236-
p7XSo7aWGdPBc+b6utaBmCQ7rQKQoWtAuthQCiold2KfJIPTT8xwg9blPumc+YDZC/wYGdAyHpJk
2237-
vUbHbHWAp5No6pK/WhhLEWrFjUwtPEv1Agf8YmnsuXUQYkeZoHm8ogP16gt2uHoxcEMdf2C6pmbw
2238-
hUMsWGhanboh4IzzmsIpWs134jVPqD/c74bZHdY69UKKSn/+KfVhxLgUlToemayLMYQOqfEC61bh
2239-
cbhwaqoGUzIyZRFHPmau5juaWqwRn3mpWmoEA5nhzS5gog/5jbcFQqOZvmBasZtwYlG93k5GEiyw
2240-
buHhMWLjDarEGpMGB2LFs5nIJkhp/nUmZneFaRth++lieJtHepIvKgx6PJqIlD9X2j6pG1i9x3pZ
2241-
5bHuCPFiirGHeO7McvoXkz786GaKVzC9DSpnOxJdc4xm6NSVq7lNEnKdVlnpu9BNYoKX2Iq3wvgh
2242-
gGEUM66kK6j4NiyoneuPLSwaCWDxczgaolEWpiMyDVDb7dNuLAbriL8ig8mmeju31oNvQdpnvEPC
2243-
1vAXbWacGRVrGt/uXN/gU0CDDwgooKRrHfTBb1/s9lYZ8ZqOBU0yLvpuP6+K9hLFsvIjeNhBi0KL
2244-
MlOuWRn3FRwx5oHXjl0YImUx0+gLzjGchrgzca026ETmYJzPD+IpuKzNi8AFn048Thd63OdD86M6
2245-
84zE8yQm0VqXdbbgvub2pKVnS76icBGdeTHHXTKspUmr4NYo/furFLKiMdQzFjHJNcdAnMhltBJK
2246-
0/IKX3DVFqvPJ2dLE7bDBkH0l/PJ29074+F0CsGYOxsb7U3myTUncYfXqnLLfa6sJybX4g+hmcjO
2247-
kMRBfA1JellfRRKJcyRpxdS4rIl6FdmQCWjo/o9Qz7yKffoP4JHjOvABcRn4CZIT2RH4jnxmfpVG
2248-
qgLaAvQBNfuO6X0/Ux02nb4FKx3vgP+XnkX0QW9pLy/NsXgdN24dD3LxO2Nwil7Zlc1dqtP3d7/h
2249-
kzp1/+7hGBuY4pk0XD/0Ao/oTe/XGrfyM773aB7iUhgkpy+dwAMalxMP0DrBcsVw/6p25+/hobP9
2250-
GBknrWExDhLJ1bwt1NcCNblaFbMKCyvmX0PeRaQ=
2228+
eJytV22L4zYQ/q5fMfVS6rRZt7TfFkJp745y9LiWY6GUZTFaW0nUdSQjKcnmfn1nJL9ItrPXDzUs
2229+
KJpHM6Nn3rTy0GrjQB5aJsNS235lL8PyzI2SamcZuwHdVroWIC0o7YDDSRp35I1QJzjo+tiINVgN
2230+
ZwEVV3C0iHTgNGylqsHtBVhXN/IJFb33urlyX8E9HtDmGbSC9tJe1ghE/YejdfAk0EZQjLvcgRFW
2231+
1sKCVKQO9aC22/bi9lp9jzi5laK+fSkuxWeopRGV0+YyXM77zhgKFD8I2OB1i5a7fdHtkMi6o5ON
2232+
LWk/Qvyjpcon8DwoLMpyKxtRlqs1ZIOCbMXkdjiutDnQIk8NrGAzcyKfnRn0r+4Y4NfHo6BFnt0j
2233+
rVEYBgvQ8uqZ75BBB19b4G0ruLEUDWQ18AeWeGh0xZ1E9rkNmxfrxGFU9DPeRTRWBOul97wsC6ms
2234+
MC7/YQ2TS3mYEbwpR182lGVFo3ldhnDmWTk6PQKzNXzUSkx1riHPUER/pOfP338r377/9O7N/R+f
2235+
/l4FgzfwRrcXfwEjGnHC1MKbOyOfjk5YD3HmEu4Q7mHESVq8d1mie6m/RSz1R8RLJVoHv/Qa3xmj
2236+
zait5dZ29JyEua51EDK2NToiGbokpY01haDSait3dC9pUXBnn2XL2HCFJ26FRV/UjnWufcRYRl6N
2237+
APQDF1i9N+imq/bwdJRNXYoXB2M+Qq2FVd84eFb6DHv8w0TZCecJxSKzUT0FRXsq2DMWtj5buKVC
2238+
33NTU0WENCIIpp3Rx672vXFR0+WK1oitfFkxKhL/u+FuiwlPBZGh0p9+zMI1UpaKSh8OXNXFeIWO
2239+
t3EDs1jjcthgXk/VYIRGVJ5AVmMga7GlbsUb+VmUuqW6sLkVzTbC0Ed+426B1BhuLhhkrC1sW5S9
2240+
KZK+OXQDD48JTDSoEjNOWeyKlchnR9ZRSFf/zcRsr7BtI13fYqxoV4y9qiSq8qQVUsx8codAYml+
2241+
wBzJulrsv4TkYplW9kqYF4M7/Og6SVAw3Y0yZANRLmDujmZo1aWlvWOM3KVJVYba822XaCRY8Vba
2242+
UProejFDMZwdIXPS/Th1tr4SNrBopiPDB8H336R5JtxPW2MW8bbdZX07jMaPeEGEzaeKO79uBuei
2243+
aM+wHfQvmsLYGireNKGqhbnFQW+ga1h0G9ZVCNoPkxaLutVWvmRj3tIZf/VuFmdFe0kvEvruMHgW
2244+
Dy2emaJmmdsnbQJcRV57uLQkylPQ6Au2K2x6OChxljboRO4pnLcJwhRC1fYscZjPPF4o5RALIw76
2245+
JHI6vmKpiGa5qvMF941wR6MCjIX3zBcyF/lZyOakTMZplNYKjocyvL1KqSrqNz2wSEVddQziycmc
2246+
un9pW1Hh+63aYPaFAG2omXb8IJFhc95ku31vPm5KMSFzd1OjvUlsR+yamzi+a135uT5X1wvZNQ5i
2247+
esopPRN92IGvsUmv51fYRPGcTZooNc5mkl5lNwYB9d7/ke6ZV6lPXyQfMdfJj4TL5E/YLKds9vo6
2248+
8YmH2ZmoimSL9Efy/Ftudn1v9fx0GhfsdNghBq+9hOhDf2ksL/W0dBo3fhoP59KnxeAUPbMrt/Lh
2249+
zj68/xXf1Jn/xw5b2gBK+9Ow/dAfeERver9wQHD7jG88ao44IYaj09dN5AL1zokLaJ54uWK5f1f7
2250+
9Xfw0Bl/TK2T2jglhyOzJIvisZBlC1J2NTdmeRbnzb+iN0J5
22512251
"""
22522252
)
22532253

virtualenv_embedded/distutils-init.py

Lines changed: 44 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
1+
import imp
12
import os
23
import sys
3-
import warnings
4-
import imp
5-
import opcode # opcode is not a virtualenv module, so we can use it to find the stdlib
6-
# Important! To work on pypy, this must be a module that resides in the
7-
# lib-python/modified-x.y.z directory
4+
import warnings
5+
6+
# opcode is not a virtualenv module, so we can use it to find the stdlib
7+
# Important! To work on pypy, this must be a module that resides in the
8+
# lib-python/modified-x.y.z directory
9+
import opcode
810

911
dirname = os.path.dirname
1012

11-
distutils_path = os.path.join(os.path.dirname(opcode.__file__), 'distutils')
13+
distutils_path = os.path.join(os.path.dirname(opcode.__file__), "distutils")
1214
if os.path.normpath(distutils_path) == os.path.dirname(os.path.normpath(__file__)):
13-
warnings.warn(
14-
"The virtualenv distutils package at %s appears to be in the same location as the system distutils?")
15+
warnings.warn("The virtualenv distutils package at %s appears to be in the same location as the system distutils?")
1516
else:
1617
__path__.insert(0, distutils_path)
17-
real_distutils = imp.load_module("_virtualenv_distutils", None, distutils_path, ('', '', imp.PKG_DIRECTORY))
18+
real_distutils = imp.load_module("_virtualenv_distutils", None, distutils_path, ("", "", imp.PKG_DIRECTORY))
1819
# Copy the relevant attributes
1920
try:
2021
__revision__ = real_distutils.__revision__
2122
except AttributeError:
2223
pass
2324
__version__ = real_distutils.__version__
2425

25-
from distutils import dist, sysconfig
26+
from distutils import dist, sysconfig # isort:skip
2627

2728
try:
2829
basestring
@@ -32,70 +33,88 @@
3233
## patch build_ext (distutils doesn't know how to get the libs directory
3334
## path on windows - it hardcodes the paths around the patched sys.prefix)
3435

35-
if sys.platform == 'win32':
36+
if sys.platform == "win32":
3637
from distutils.command.build_ext import build_ext as old_build_ext
38+
3739
class build_ext(old_build_ext):
38-
def finalize_options (self):
40+
def finalize_options(self):
3941
if self.library_dirs is None:
4042
self.library_dirs = []
4143
elif isinstance(self.library_dirs, basestring):
4244
self.library_dirs = self.library_dirs.split(os.pathsep)
43-
45+
4446
self.library_dirs.insert(0, os.path.join(sys.real_prefix, "Libs"))
4547
old_build_ext.finalize_options(self)
46-
47-
from distutils.command import build_ext as build_ext_module
48+
49+
from distutils.command import build_ext as build_ext_module
50+
4851
build_ext_module.build_ext = build_ext
4952

5053
## distutils.dist patches:
5154

5255
old_find_config_files = dist.Distribution.find_config_files
56+
57+
5358
def find_config_files(self):
5459
found = old_find_config_files(self)
55-
system_distutils = os.path.join(distutils_path, 'distutils.cfg')
56-
#if os.path.exists(system_distutils):
60+
system_distutils = os.path.join(distutils_path, "distutils.cfg")
61+
# if os.path.exists(system_distutils):
5762
# found.insert(0, system_distutils)
58-
# What to call the per-user config file
59-
if os.name == 'posix':
63+
# What to call the per-user config file
64+
if os.name == "posix":
6065
user_filename = ".pydistutils.cfg"
6166
else:
6267
user_filename = "pydistutils.cfg"
6368
user_filename = os.path.join(sys.prefix, user_filename)
6469
if os.path.isfile(user_filename):
6570
for item in list(found):
66-
if item.endswith('pydistutils.cfg'):
71+
if item.endswith("pydistutils.cfg"):
6772
found.remove(item)
6873
found.append(user_filename)
6974
return found
75+
76+
7077
dist.Distribution.find_config_files = find_config_files
7178

7279
## distutils.sysconfig patches:
7380

7481
old_get_python_inc = sysconfig.get_python_inc
82+
83+
7584
def sysconfig_get_python_inc(plat_specific=0, prefix=None):
7685
if prefix is None:
7786
prefix = sys.real_prefix
7887
return old_get_python_inc(plat_specific, prefix)
88+
89+
7990
sysconfig_get_python_inc.__doc__ = old_get_python_inc.__doc__
8091
sysconfig.get_python_inc = sysconfig_get_python_inc
8192

8293
old_get_python_lib = sysconfig.get_python_lib
94+
95+
8396
def sysconfig_get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
8497
if standard_lib and prefix is None:
8598
prefix = sys.real_prefix
8699
return old_get_python_lib(plat_specific, standard_lib, prefix)
100+
101+
87102
sysconfig_get_python_lib.__doc__ = old_get_python_lib.__doc__
88103
sysconfig.get_python_lib = sysconfig_get_python_lib
89104

90105
old_get_config_vars = sysconfig.get_config_vars
106+
107+
91108
def sysconfig_get_config_vars(*args):
92109
real_vars = old_get_config_vars(*args)
93-
if sys.platform == 'win32':
110+
if sys.platform == "win32":
94111
lib_dir = os.path.join(sys.real_prefix, "libs")
95-
if isinstance(real_vars, dict) and 'LIBDIR' not in real_vars:
96-
real_vars['LIBDIR'] = lib_dir # asked for all
97-
elif isinstance(real_vars, list) and 'LIBDIR' in args:
98-
real_vars = real_vars + [lib_dir] # asked for list
112+
if isinstance(real_vars, dict) and "LIBDIR" not in real_vars:
113+
real_vars["LIBDIR"] = lib_dir # asked for all
114+
elif isinstance(real_vars, list) and "LIBDIR" in args:
115+
real_vars = real_vars + [lib_dir] # asked for list
99116
return real_vars
117+
118+
100119
sysconfig_get_config_vars.__doc__ = old_get_config_vars.__doc__
101120
sysconfig.get_config_vars = sysconfig_get_config_vars

0 commit comments

Comments
 (0)