From 7a177c08ab8981645828d3b4d9083cdd9018d197 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Wed, 26 Jun 2019 08:55:57 -0700 Subject: [PATCH] Improve Windows commands in tutorial (GH-14379) --- Doc/tutorial/interpreter.rst | 10 ++++------ Doc/using/windows.rst | 12 ++++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst index 87d2fefac7e..aeb6aa0d8e8 100644 --- a/Doc/tutorial/interpreter.rst +++ b/Doc/tutorial/interpreter.rst @@ -23,12 +23,10 @@ is an installation option, other places are possible; check with your local Python guru or system administrator. (E.g., :file:`/usr/local/python` is a popular alternative location.) -On Windows machines, the Python installation is usually placed in -:file:`C:\\Python38`, though you can change this when you're running the -installer. To add this directory to your path, you can type the following -command into :ref:`a command prompt window `:: - - set path=%path%;C:\python38 +On Windows machines where you have installed from the :ref:`Microsoft Store +`, the :file:`python3.9` command will be available. If you have +the :ref:`py.exe launcher ` installed, you can use the :file:`py` +command. See :ref:`setting-envvars` for other ways to launch Python. Typing an end-of-file character (:kbd:`Control-D` on Unix, :kbd:`Control-Z` on Windows) at the primary prompt causes the interpreter to exit with a zero exit diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index 462e4c2b6c6..54f14e604b7 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -214,13 +214,13 @@ of available options is shown below. For example, to silently install a default, system-wide Python installation, you could use the following command (from an elevated command prompt):: - python-3.8.0.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0 + python-3.9.0.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0 To allow users to easily install a personal copy of Python without the test suite, you could provide a shortcut with the following command. This will display a simplified initial page and disallow customization:: - python-3.8.0.exe InstallAllUsers=0 Include_launcher=0 Include_test=0 + python-3.9.0.exe InstallAllUsers=0 Include_launcher=0 Include_test=0 SimpleInstall=1 SimpleInstallDescription="Just for me, no test suite." (Note that omitting the launcher also omits file associations, and is only @@ -257,13 +257,13 @@ where a large number of installations are going to be performed it is very useful to have a locally cached copy. Execute the following command from Command Prompt to download all possible -required files. Remember to substitute ``python-3.8.0.exe`` for the actual +required files. Remember to substitute ``python-3.9.0.exe`` for the actual name of your installer, and to create layouts in their own directories to avoid collisions between files with the same name. :: - python-3.8.0.exe /layout [optional target directory] + python-3.9.0.exe /layout [optional target directory] You may also specify the ``/quiet`` option to hide the progress display. @@ -530,7 +530,7 @@ To temporarily set environment variables, open Command Prompt and use the .. code-block:: doscon - C:\>set PATH=C:\Program Files\Python 3.8;%PATH% + C:\>set PATH=C:\Program Files\Python 3.9;%PATH% C:\>set PYTHONPATH=%PYTHONPATH%;C:\My_python_lib C:\>python @@ -603,7 +603,7 @@ of your Python installation, delimited by a semicolon from other entries. An example variable could look like this (assuming the first two entries already existed):: - C:\WINDOWS\system32;C:\WINDOWS;C:\Program Files\Python 3.8 + C:\WINDOWS\system32;C:\WINDOWS;C:\Program Files\Python 3.9 .. _launcher: