Skip to content

Commit 88dc84b

Browse files
authored
gh-125729: Makes the installation of the turtle module dependent on the Tcl/Tk install option (GH-126176)
1 parent 29cbcbd commit 88dc84b

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Makes the presence of the :mod:`turtle` module dependent on the Tcl/Tk installer option. Previously, the module was always installed but would be unusable without Tcl/Tk.

Tools/msi/bundle/Default.wxl

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ Select Customize to review current options.</String>
7070
<String Id="Include_docHelpLabel">Installs the Python documentation files.</String>
7171
<String Id="Include_pipLabel">&amp;pip</String>
7272
<String Id="Include_pipHelpLabel">Installs pip, which can download and install other Python packages.</String>
73-
<String Id="Include_tcltkLabel">tcl/tk and &amp;IDLE</String>
74-
<String Id="Include_tcltkHelpLabel">Installs tkinter and the IDLE development environment.</String>
73+
<String Id="Include_tcltkLabel">Tcl/Tk, turtle and &amp;IDLE</String>
74+
<String Id="Include_tcltkHelpLabel">Installs tkinter, turtle and the IDLE development environment.</String>
7575
<String Id="Include_testLabel">Python &amp;test suite</String>
7676
<String Id="Include_testHelpLabel">Installs the standard library test suite.</String>
7777
<String Id="Include_launcherLabel">py &amp;launcher</String>

Tools/msi/lib/lib.wixproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<InstallFiles Include="$(PySourcePath)Lib\**\*"
2020
Exclude="$(PySourcePath)Lib\**\*.pyc;
2121
$(PySourcePath)Lib\**\*.pyo;
22+
$(PySourcePath)Lib\turtle.py;
2223
$(PySourcePath)Lib\site-packages\README;
2324
@(ExcludeFolders->'$(PySourcePath)%(Identity)\*');
2425
@(ExcludeFolders->'$(PySourcePath)%(Identity)\**\*')">
@@ -32,4 +33,4 @@
3233
</ItemGroup>
3334

3435
<Import Project="..\msi.targets" />
35-
</Project>
36+
</Project>

Tools/msi/tcltk/tcltk.wixproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<Group>tcltk_lib</Group>
2929
</InstallFiles>
3030

31-
<InstallFiles Include="$(PySourcePath)Lib\tkinter\**\*;$(PySourcePath)Lib\idlelib\**\*;$(PySourcePath)Lib\turtledemo\**\*"
31+
<InstallFiles Include="$(PySourcePath)Lib\tkinter\**\*;$(PySourcePath)Lib\idlelib\**\*;$(PySourcePath)Lib\turtledemo\**\*;$(PySourcePath)Lib\turtle.py"
3232
Exclude="$(PySourcePath)Lib\**\*.pyc;$(PySourcePath)Lib\**\*.pyo">
3333
<SourceBase>$(PySourcePath)</SourceBase>
3434
<Source>!(bindpath.src)</Source>
@@ -39,4 +39,4 @@
3939
</ItemGroup>
4040

4141
<Import Project="..\msi.targets" />
42-
</Project>
42+
</Project>

0 commit comments

Comments
 (0)