[Python-checkins] cpython (3.4): - Issue #24351: Clarify what is meant by "identifier" in the context of

Tue Jun 9 20:24:47 CEST 2015

https://hg.python.org/cpython/rev/20bf84cd38bc
changeset: 96568:20bf84cd38bc
branch: 3.4
parent: 96565:bb51d486a899
user: Barry Warsaw <barry at python.org>
date: Tue Jun 09 14:20:31 2015 -0400
summary:
 - Issue #24351: Clarify what is meant by "identifier" in the context of
 string.Template instances.
files:
 Doc/library/string.rst | 12 +++++++-----
 Misc/NEWS | 3 +++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -640,12 +640,14 @@
 * ``$$`` is an escape; it is replaced with a single ``$``.
 
 * ``$identifier`` names a substitution placeholder matching a mapping key of
- ``"identifier"``. By default, ``"identifier"`` must spell a Python
- identifier. The first non-identifier character after the ``$`` character
- terminates this placeholder specification.
+ ``"identifier"``. By default, ``"identifier"`` is restricted to any
+ case-insensitive ASCII alphanumeric string (including underscores) that
+ starts with an underscore or ASCII letter. The first non-identifier
+ character after the ``$`` character terminates this placeholder
+ specification.
 
-* ``${identifier}`` is equivalent to ``$identifier``. It is required when valid
- identifier characters follow the placeholder but are not part of the
+* ``${identifier}`` is equivalent to ``$identifier``. It is required when
+ valid identifier characters follow the placeholder but are not part of the
 placeholder, such as ``"${noun}ification"``.
 
 Any other appearance of ``$`` in the string will result in a :exc:`ValueError`
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -323,6 +323,9 @@
 Documentation
 -------------
 
+- Issue #24351: Clarify what is meant by "identifier" in the context of
+ string.Template instances.
+
 - Issue #22155: Add File Handlers subsection with createfilehandler to tkinter
 doc. Remove obsolete example from FAQ. Patch by Martin Panter.
 
-- 
Repository URL: https://hg.python.org/cpython
