[3.7] Revert "[3.7] bpo-34977: Add Windows App Store package (GH-10245)"

.gitattributes

@@ -19,7 +19,6 @@
 
 # Specific binary files
 Lib/test/sndhdrdata/sndhdr.* binary
-PC/classicAppCompat.* binary
 
 # Text files that should not be subject to eol conversion
 Lib/test/cjkencodings/* -text

Lib/test/test_pathlib.py

@@ -1519,7 +1519,7 @@ def test_resolve_common(self):
             # resolves to 'dirB/..' first before resolving to parent of dirB.
             self._check_resolve_relative(p, P(BASE, 'foo', 'in', 'spam'), False)
         # Now create absolute symlinks
-        d = support._longpath(tempfile.mkdtemp(suffix='-dirD', dir=os.getcwd()))
+        d = support._longpath(tempfile.mkdtemp(suffix='-dirD'))
         self.addCleanup(support.rmtree, d)
         os.symlink(os.path.join(d), join('dirA', 'linkX'))
         os.symlink(join('dirB'), os.path.join(d, 'linkY'))

Lib/test/test_venv.py

@@ -243,7 +243,6 @@ def test_isolation(self):
             self.assertIn('include-system-site-packages = %s\n' % s, data)
 
     @unittest.skipUnless(can_symlink(), 'Needs symlinks')
-    @unittest.skipIf(os.name == 'nt', 'Symlinks are never used on Windows')
     def test_symlinking(self):
         """
         Test symlinking works as expected

Lib/venv/__init__.py

@@ -9,7 +9,6 @@
 import shutil
 import subprocess
 import sys
-import sysconfig
 import types
 
 logger = logging.getLogger(__name__)
@@ -64,11 +63,10 @@ def create(self, env_dir):
         self.system_site_packages = False
         self.create_configuration(context)
         self.setup_python(context)
-        if not self.upgrade:
-            self.setup_scripts(context)
         if self.with_pip:
             self._setup_pip(context)
         if not self.upgrade:
+            self.setup_scripts(context)
             self.post_setup(context)
         if true_system_site_packages:
             # We had set it to False before, now
@@ -159,6 +157,14 @@ def create_configuration(self, context):
             f.write('include-system-site-packages = %s\n' % incl)
             f.write('version = %d.%d.%d\n' % sys.version_info[:3])
 
+    if os.name == 'nt':
+        def include_binary(self, f):
+            if f.endswith(('.pyd', '.dll')):
+                result = True
+            else:
+                result = f.startswith('python') and f.endswith('.exe')
+            return result
+
     def symlink_or_copy(self, src, dst, relative_symlinks_ok=False):
         """
         Try symlinking a file, and if that fails, fall back to copying.
@@ -188,9 +194,9 @@ def setup_python(self, context):
         binpath = context.bin_path
         path = context.env_exe
         copier = self.symlink_or_copy
+        copier(context.executable, path)
         dirname = context.python_dir
         if os.name != 'nt':
-            copier(context.executable, path)
             if not os.path.islink(path):
                 os.chmod(path, 0o755)
             for suffix in ('python', 'python3'):
@@ -202,33 +208,32 @@ def setup_python(self, context):
                     if not os.path.islink(path):
                         os.chmod(path, 0o755)
         else:
-            # For normal cases, the venvlauncher will be copied from
-            # our scripts folder. For builds, we need to copy it
-            # manually.
-            if sysconfig.is_python_build(True):
-                suffix = '.exe'
-                if context.python_exe.lower().endswith('_d.exe'):
-                    suffix = '_d.exe'
-
-                src = os.path.join(dirname, "venvlauncher" + suffix)
-                dst = os.path.join(binpath, context.python_exe)
-                copier(src, dst)
-
-                src = os.path.join(dirname, "venvwlauncher" + suffix)
-                dst = os.path.join(binpath, "pythonw" + suffix)
-                copier(src, dst)
-
-                # copy init.tcl over
-                for root, dirs, files in os.walk(context.python_dir):
-                    if 'init.tcl' in files:
-                        tcldir = os.path.basename(root)
-                        tcldir = os.path.join(context.env_dir, 'Lib', tcldir)
-                        if not os.path.exists(tcldir):
-                            os.makedirs(tcldir)
-                        src = os.path.join(root, 'init.tcl')
-                        dst = os.path.join(tcldir, 'init.tcl')
-                        shutil.copyfile(src, dst)
-                        break
+            subdir = 'DLLs'
+            include = self.include_binary
+            files = [f for f in os.listdir(dirname) if include(f)]
+            for f in files:
+                src = os.path.join(dirname, f)
+                dst = os.path.join(binpath, f)
+                if dst != context.env_exe:  # already done, above
+                    copier(src, dst)
+            dirname = os.path.join(dirname, subdir)
+            if os.path.isdir(dirname):
+                files = [f for f in os.listdir(dirname) if include(f)]
+                for f in files:
+                    src = os.path.join(dirname, f)
+                    dst = os.path.join(binpath, f)
+                    copier(src, dst)
+            # copy init.tcl over
+            for root, dirs, files in os.walk(context.python_dir):
+                if 'init.tcl' in files:
+                    tcldir = os.path.basename(root)
+                    tcldir = os.path.join(context.env_dir, 'Lib', tcldir)
+                    if not os.path.exists(tcldir):
+                        os.makedirs(tcldir)
+                    src = os.path.join(root, 'init.tcl')
+                    dst = os.path.join(tcldir, 'init.tcl')
+                    shutil.copyfile(src, dst)
+                    break
 
     def _setup_pip(self, context):
         """Installs or upgrades pip in a virtual environment"""
@@ -315,7 +320,7 @@ def install_scripts(self, context, path):
                 dstfile = os.path.join(dstdir, f)
                 with open(srcfile, 'rb') as f:
                     data = f.read()
-                if not srcfile.endswith(('.exe', '.pdb')):
+                if not srcfile.endswith('.exe'):
                     try:
                         data = data.decode('utf-8')
                         data = self.replace_variables(data, context)

PC/getpathp.c

@@ -536,16 +536,10 @@ static _PyInitError
 get_program_full_path(const _PyCoreConfig *core_config,
                       PyCalculatePath *calculate, _PyPathConfig *config)
 {
-    const wchar_t *pyvenv_launcher;
     wchar_t program_full_path[MAXPATHLEN+1];
     memset(program_full_path, 0, sizeof(program_full_path));
 
-    /* The launcher may need to force the executable path to a
-     * different environment, so override it here. */
-    pyvenv_launcher = _wgetenv(L"__PYVENV_LAUNCHER__");
-    if (pyvenv_launcher && pyvenv_launcher[0]) {
-        wcscpy_s(program_full_path, MAXPATHLEN+1, pyvenv_launcher);
-    } else if (!GetModuleFileNameW(NULL, program_full_path, MAXPATHLEN)) {
+    if (!GetModuleFileNameW(NULL, program_full_path, MAXPATHLEN)) {
         /* GetModuleFileName should never fail when passed NULL */
         return _Py_INIT_ERR("Cannot determine program path");
     }