https://github.com/python/cpython/commit/46245b0d831b9f5b15b4a0483c785ea71bffef12
commit: 46245b0d831b9f5b15b4a0483c785ea71bffef12
branch: main
author: Hugo van Kemenade <[email protected]>
committer: hugovk <[email protected]>
date: 2024-02-13T23:55:00-07:00
summary:
Docs: Use substitutions instead of manual version updates (#115416)
files:
M Doc/conf.py
M Doc/tutorial/interpreter.rst
M Doc/tutorial/stdlib.rst
M Doc/tutorial/stdlib2.rst
diff --git a/Doc/conf.py b/Doc/conf.py
index 677d139046e5d0..0e84d866a22f5b 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -66,6 +66,8 @@
rst_epilog = f"""
.. |python_version_literal| replace:: ``Python {version}``
+.. |python_x_dot_y_literal| replace:: ``python{version}``
+.. |usr_local_bin_python_x_dot_y_literal| replace::
``/usr/local/bin/python{version}``
"""
# There are two options for replacing |today|: either, you set today to some
diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst
index 42ebf2b3d294a8..299b6c2777adc0 100644
--- a/Doc/tutorial/interpreter.rst
+++ b/Doc/tutorial/interpreter.rst
@@ -10,7 +10,7 @@ Using the Python Interpreter
Invoking the Interpreter
========================
-The Python interpreter is usually installed as
:file:`/usr/local/bin/python3.13`
+The Python interpreter is usually installed as
|usr_local_bin_python_x_dot_y_literal|
on those machines where it is available; putting :file:`/usr/local/bin` in your
Unix shell's search path makes it possible to start it by typing the command:
@@ -24,7 +24,7 @@ Python guru or system administrator. (E.g.,
:file:`/usr/local/python` is a
popular alternative location.)
On Windows machines where you have installed Python from the :ref:`Microsoft
Store
-<windows-store>`, the :file:`python3.13` command will be available. If you have
+<windows-store>`, the |python_x_dot_y_literal| command will be available. If
you have
the :ref:`py.exe launcher <launcher>` installed, you can use the :file:`py`
command. See :ref:`setting-envvars` for other ways to launch Python.
diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
index 63f4b5e1ce0207..9def2a5714950b 100644
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -15,7 +15,7 @@ operating system::
>>> import os
>>> os.getcwd() # Return the current working directory
- 'C:\\Python312'
+ 'C:\\Python313'
>>> os.chdir('/server/accesslogs') # Change current working directory
>>> os.system('mkdir today') # Run the command mkdir in the system shell
0
diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst
index 33f311db3a24d2..09b6f3d91bcfed 100644
--- a/Doc/tutorial/stdlib2.rst
+++ b/Doc/tutorial/stdlib2.rst
@@ -279,7 +279,7 @@ applications include caching objects that are expensive to
create::
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
d['primary'] # entry was automatically removed
- File "C:/python312/lib/weakref.py", line 46, in __getitem__
+ File "C:/python313/lib/weakref.py", line 46, in __getitem__
o = self.data[key]()
KeyError: 'primary'
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
