Fix additional changes (missed in last commit)

Author: zooba

.azure-pipelines/windows-layout-steps.yml

@@ -12,7 +12,7 @@ steps:
   displayName: Show layout info (${{ parameters.kind }})
 
 - ${{ if eq(parameters.fulltest, 'true') }}:
-  - script: .\python.exe -m test -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0 --junit-xml="$(Build.BinariesDirectory)\test-results-${{ parameters.kind }}.xml" --tempdir "$(Build.BinariesDirectory)\tmp-${{ parameters.kind }}-$(arch)" -i test_launcher
+  - script: .\python.exe -m test -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0 --junit-xml="$(Build.BinariesDirectory)\test-results-${{ parameters.kind }}.xml" --tempdir "$(Build.BinariesDirectory)\tmp-${{ parameters.kind }}-$(arch)"
     workingDirectory: $(Build.BinariesDirectory)\layout-${{ parameters.kind }}-$(arch)
     displayName: ${{ parameters.kind }} Tests
     env:

.gitattributes

@@ -19,7 +19,7 @@
 *.zip binary
 
 # Specific binary files
-PC/classicAppCompat.* binary
+# -- None right now --
 
 # Text files that should not be subject to eol conversion
 [attr]noeol -text

.github/CODEOWNERS

@@ -188,12 +188,8 @@ Tools/wasm/wasi               @brettcannon @emmatyping @savannahostrowski
 PC/                           @python/windows-team
 PCbuild/                      @python/windows-team
 
-# Windows installer packages
-Tools/msi/                    @python/windows-team
-Tools/nuget/                  @python/windows-team
-
-# Windows Launcher
-PC/launcher.c                 @python/windows-team @vsajip
+# Windows Venv launcher/redirector
+PC/venvlauncher.c             @python/windows-team @vsajip
 
 
 # ----------------------------------------------------------------------------

.gitignore

@@ -50,7 +50,7 @@ gmon.out
 
 *.exe
 
-# Ignore core dumps... but not Tools/msi/core/ or the like.
+# Ignore core dumps... but not .../core/ subdirectories
 core
 !core/
 
@@ -158,7 +158,6 @@ Tools/unicode/data/
 /coverage/
 /externals/
 /htmlcov/
-Tools/msi/obj
 Tools/ssl/amd64
 Tools/ssl/win32
 Tools/freeze/test/outdir

Include/internal/pycore_magic_number.h

@@ -310,9 +310,6 @@ Known values:
     You should always use the *upcoming* tag. For example, if 3.12a6 came out
     a week ago, I should put "Python 3.12a7" next to my new magic number.
 
-Whenever PYC_MAGIC_NUMBER is changed, the ranges in the magic_values array in
-PC/launcher.c must also be updated.
-
 */
 
 #define PYC_MAGIC_NUMBER 3704

InternalDocs/interpreter.md

@@ -307,9 +307,7 @@ With a new bytecode you must also change what is called the "magic number" for
 .pyc files: bump the value of the variable `MAGIC_NUMBER` in
 [`Lib/importlib/_bootstrap_external.py`](../Lib/importlib/_bootstrap_external.py).
 Changing this number will lead to all .pyc files with the old `MAGIC_NUMBER`
-to be recompiled by the interpreter on import.  Whenever `MAGIC_NUMBER` is
-changed, the ranges in the `magic_values` array in
-[`PC/launcher.c`](../PC/launcher.c) may also need to be updated.  Changes to
+to be recompiled by the interpreter on import.  Changes to
 [`Lib/importlib/_bootstrap_external.py`](../Lib/importlib/_bootstrap_external.py)
 will take effect only after running `make regen-importlib`.
 

Lib/test/test_tools/test_compute_changes.py

@@ -109,15 +109,6 @@ def test_unix(self):
                 self.assertTrue(result.run_tests)
                 self.assertFalse(result.run_windows_tests)
 
-    def test_msi(self):
-        for f in (
-            ".github/workflows/reusable-windows-msi.yml",
-            "Tools/msi/build.bat",
-        ):
-            with self.subTest(f=f):
-                result = process_changed_files({Path(f)})
-                self.assertTrue(result.run_windows_msi)
-
     def test_all_run(self):
         for f in (
             ".github/workflows/some-new-workflow.yml",

PCbuild/readme.txt

@@ -140,12 +140,6 @@ CPython in different ways:
 pythonw
     pythonw.exe, a variant of python.exe that doesn't open a Command
     Prompt window
-pylauncher
-    py.exe, the Python Launcher for Windows, see
-        https://docs.python.org/3/using/windows.html#launcher
-pywlauncher
-    pyw.exe, a variant of py.exe that doesn't open a Command Prompt
-    window
 _testembed
     _testembed.exe, a small program that embeds Python for testing
     purposes, used by test_capi.py
@@ -156,8 +150,6 @@ _freeze_module
     _freeze_module.exe, used to regenerate frozen modules in Python
     after changes have been made to the corresponding source files
     (e.g. Lib\importlib\_bootstrap.py).
-pyshellext
-    pyshellext.dll, the shell extension deployed with the launcher
 python3dll
     python3.dll, the PEP 384 Stable ABI dll
     (not installed on free-threaded builds)

PCbuild/venvlauncher.vcxproj

@@ -109,9 +109,6 @@
   <ItemGroup>
     <ClCompile Include="..\PC\venvlauncher.c" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\PC\icons\launcher.ico" />
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\PC\python_exe.rc" />
   </ItemGroup>

PCbuild/venvlauncher.vcxproj.filters

@@ -9,12 +9,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\PC\icons\launcher.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\PC\pylauncher.rc">
+    <ResourceCompile Include="..\PC\python_exe.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>