cpython (merge 2.7 -> 2.7): merge heads

http://hg.python.org/cpython/rev/7f4aaa9c4588 changeset: 73260:7f4aaa9c4588 branch: 2.7 parent: 73258:1de4d92cd6a4 parent: 73259:3a126a459b6f user: Sandro Tosi <sandro.tosi@gmail.com> date: Mon Oct 31 19:23:25 2011 +0100 summary: merge heads files: Doc/reference/expressions.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -347,7 +347,7 @@ quotes: .. productionlist:: - string_conversion: "'" `expression_list` "'" + string_conversion: "`" `expression_list` "`" A string conversion evaluates the contained expression list and converts the resulting object into a string according to rules specific to its type. -- Repository URL: http://hg.python.org/cpython
participants (1)
-
sandro.tosi