summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMariatta <Mariatta@users.noreply.github.com>2017-03-30 19:27:19 (GMT)
committerGitHub <noreply@github.com>2017-03-30 19:27:19 (GMT)
commit7b5b1379ac2c1e89ebf90b88b5d32457910e975e (patch)
tree907ba6fc53b50569a0424548cf1ea44f279c6049 /Doc
parentbf4bb2e43030661e568d5d4b046e8b9351cc164c (diff)
downloadcpython-7b5b1379ac2c1e89ebf90b88b5d32457910e975e.zip
cpython-7b5b1379ac2c1e89ebf90b88b5d32457910e975e.tar.gz
cpython-7b5b1379ac2c1e89ebf90b88b5d32457910e975e.tar.bz2
bpo-29928: Add f-string to the Glossary (GH-864) (GH-914)
(cherry picked from commit 33db068dac7686e37736f7ecf8abb2aee0345cf2)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/glossary.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 495934a..8123841 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -320,6 +320,11 @@ Glossary
A module written in C or C++, using Python's C API to interact with the
core and with user code.
+ f-string
+ String literals prefixed with ``'f'`` or ``'F'`` are commonly called
+ "f-strings" which is short for
+ :ref:`formatted string literals <f-strings>`. See also :pep:`498`.
+
file object
An object exposing a file-oriented API (with methods such as
:meth:`read()` or :meth:`write()`) to an underlying resource. Depending