bpo-34977: Use venv redirector instead of original python.exe on Wind… · python/cpython@1c3de54 (original) (raw)

`@@ -64,10 +64,11 @@ def create(self, env_dir):

64

`self.system_site_packages = False

65

`self.create_configuration(context)

66

`self.setup_python(context)

67

if not self.upgrade:

68

self.setup_scripts(context)

67

69

`if self.with_pip:

68

70

`self._setup_pip(context)

69

71

`if not self.upgrade:

70

self.setup_scripts(context)

71

72

`self.post_setup(context)

72

73

`if true_system_site_packages:

73

74

`# We had set it to False before, now

`@@ -158,14 +159,6 @@ def create_configuration(self, context):

158

159

`f.write('include-system-site-packages = %s\n' % incl)

159

160

`f.write('version = %d.%d.%d\n' % sys.version_info[:3])

160

161

if os.name == 'nt':

162

def include_binary(self, f):

163

if f.endswith(('.pyd', '.dll')):

164

result = True

165

else:

166

result = f.startswith('python') and f.endswith('.exe')

167

return result

168

-

169

162

`def symlink_or_copy(self, src, dst, relative_symlinks_ok=False):

170

163

`"""

171

164

` Try symlinking a file, and if that fails, fall back to copying.

`@@ -195,9 +188,9 @@ def setup_python(self, context):

195

188

`binpath = context.bin_path

196

189

`path = context.env_exe

197

190

`copier = self.symlink_or_copy

198

copier(context.executable, path)

199

191

`dirname = context.python_dir

200

192

`if os.name != 'nt':

193

copier(context.executable, path)

201

194

`if not os.path.islink(path):

202

195

`os.chmod(path, 0o755)

203

196

`for suffix in ('python', 'python3'):

`@@ -209,26 +202,22 @@ def setup_python(self, context):

209

202

`if not os.path.islink(path):

210

203

`os.chmod(path, 0o755)

211

204

`else:

212

See bpo-34011. When using a proper install, we should only need to

213

copy the top-level of DLLs.

214

include = self.include_binary

215

files = [f for f in os.listdir(dirname) if include(f)]

216

for f in files:

217

src = os.path.join(dirname, f)

218

dst = os.path.join(binpath, f)

219

if dst != context.env_exe: # already done, above

220

copier(src, dst)

221

-

222

When creating from a build directory, we continue to copy all files.

205

For normal cases, the venvlauncher will be copied from

206

our scripts folder. For builds, we need to copy it

207

manually.

223

208

`if sysconfig.is_python_build(True):

224

subdir = 'DLLs'

225

dirname = os.path.join(dirname, subdir)

226

if os.path.isdir(dirname):

227

files = [f for f in os.listdir(dirname) if include(f)]

228

for f in files:

229

src = os.path.join(dirname, f)

230

dst = os.path.join(binpath, f)

231

copier(src, dst)

209

suffix = '.exe'

210

if context.python_exe.lower().endswith('_d.exe'):

211

suffix = '_d.exe'

212

+

213

src = os.path.join(dirname, "venvlauncher" + suffix)

214

dst = os.path.join(binpath, context.python_exe)

215

copier(src, dst)

216

+

217

src = os.path.join(dirname, "venvwlauncher" + suffix)

218

dst = os.path.join(binpath, "pythonw" + suffix)

219

copier(src, dst)

220

+

232

221

`# copy init.tcl over

233

222

`for root, dirs, files in os.walk(context.python_dir):

234

223

`if 'init.tcl' in files:

`@@ -326,7 +315,7 @@ def install_scripts(self, context, path):

326

315

`dstfile = os.path.join(dstdir, f)

327

316

`with open(srcfile, 'rb') as f:

328

317

`data = f.read()

329

if not srcfile.endswith('.exe'):

318

if not srcfile.endswith(('.exe', '.pdb')):

330

319

`try:

331

320

`data = data.decode('utf-8')

332

321

`data = self.replace_variables(data, context)