summaryrefslogtreecommitdiffstats
path: root/Doc/glossary.rst
diff options
context:
space:
mode:
authorMariatta <Mariatta@users.noreply.github.com>2017-03-30 19:12:18 (GMT)
committerGitHub <noreply@github.com>2017-03-30 19:12:18 (GMT)
commit33db068dac7686e37736f7ecf8abb2aee0345cf2 (patch)
tree8c88bba876af29d4a6c439172b9326d01165e97a /Doc/glossary.rst
parent7a26464c6496c29244072fdd80f9b92c68174742 (diff)
downloadcpython-33db068dac7686e37736f7ecf8abb2aee0345cf2.zip
cpython-33db068dac7686e37736f7ecf8abb2aee0345cf2.tar.gz
cpython-33db068dac7686e37736f7ecf8abb2aee0345cf2.tar.bz2
bpo-29928: Add f-string to the Glossary (GH-864)
Diffstat (limited to 'Doc/glossary.rst')
-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