diff options
| author | Victor Stinner <vstinner@python.org> | 2023-05-23 17:40:02 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-23 17:40:02 (GMT) |
| commit | ae00b810d1d3ad7f1f7e226b02ece37c986330e7 (patch) | |
| tree | 173ec10e86e887adad8740e7833c92a464779917 /Tools/msi | |
| parent | ddb14859535ab8091381b9d0baf32dbe245b5e65 (diff) | |
| download | cpython-ae00b810d1d3ad7f1f7e226b02ece37c986330e7.zip cpython-ae00b810d1d3ad7f1f7e226b02ece37c986330e7.tar.gz cpython-ae00b810d1d3ad7f1f7e226b02ece37c986330e7.tar.bz2 | |
gh-104780: Remove 2to3 program and lib2to3 module (#104781)
* Remove the Tools/scripts/2to3 script.
* Remove the Lib/test/test_lib2to3/ directory.
* Doc/tools/extensions/pyspecific.py: remove the "2to3fixer" object
type.
* Makefile and PC/layout/main.py no longer compile lib2to3 grammar
files.
* Update Makefile for 2to3 removal.
Diffstat (limited to 'Tools/msi')
| -rw-r--r-- | Tools/msi/bundle/packagegroups/postinstall.wxs | 2 | ||||
| -rw-r--r-- | Tools/msi/lib/lib_files.wxs | 4 | ||||
| -rw-r--r-- | Tools/msi/msi.props | 5 |
3 files changed, 2 insertions, 9 deletions
diff --git a/Tools/msi/bundle/packagegroups/postinstall.wxs b/Tools/msi/bundle/packagegroups/postinstall.wxs index 64f42dd..24c72e6 100644 --- a/Tools/msi/bundle/packagegroups/postinstall.wxs +++ b/Tools/msi/bundle/packagegroups/postinstall.wxs @@ -42,7 +42,7 @@ - <?define CompileAllCommand=-E -s -Wi "[TargetDir]\Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_|lib2to3\\tests|venv\\scripts" "[TargetDir]\Lib"?> + <?define CompileAllCommand=-E -s -Wi "[TargetDir]\Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_|venv\\scripts" "[TargetDir]\Lib"?> <ExePackage Id="compileall_AllUsers" SourceFile="py.exe" Compressed="yes" diff --git a/Tools/msi/lib/lib_files.wxs b/Tools/msi/lib/lib_files.wxs index 73c0231..3e6761b 100644 --- a/Tools/msi/lib/lib_files.wxs +++ b/Tools/msi/lib/lib_files.wxs @@ -116,10 +116,6 @@ <RegistryValue Key="PythonPath" Type="string" Value="[Lib];[DLLs]" /> </RegistryKey> </Component> - <Component Id="Lib2to3_pickle_remove" Directory="Lib_lib2to3" Guid="$(var.RemoveLib2to3PickleComponentGuid)"> - <RemoveFile Id="Lib2to3_pickle_remove_files" Name="*.pickle" On="uninstall" /> - <RemoveFolder Id="Lib2to3_pickle_remove_folder" On="uninstall" /> - </Component> </ComponentGroup> </Fragment> <Fragment> diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props index 06aa0b8..cfb3ca9 100644 --- a/Tools/msi/msi.props +++ b/Tools/msi/msi.props @@ -156,9 +156,6 @@ <_Uuid Include="PythonwExeComponentGuid"> <Uri>pythonw.exe</Uri> </_Uuid> - <_Uuid Include="RemoveLib2to3PickleComponentGuid"> - <Uri>lib2to3/pickles</Uri> - </_Uuid> <_Uuid Include="CommonPythonRegComponentGuid"> <Uri>registry</Uri> </_Uuid> @@ -187,4 +184,4 @@ <DefineConstants>$(DefineConstants);@(_UuidValue,';');</DefineConstants> </PropertyGroup> </Target> -</Project>
\ No newline at end of file +</Project> |