Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Elaborate encoding recommendations, and fix ambiguous wording for list comprehensions.

This commit is contained in:
Georg Brandl 2009-06-08 18:59:09 +00:00
parent 1b8b7183ab
commit 7ae90dd22d
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Doc/tutorial/controlflow.rst
View File

@ -675,7 +675,12 @@ extracted for you:
(see :ref:`tut-firstclasses` for more on classes and methods). (see :ref:`tut-firstclasses` for more on classes and methods).
* Don't use fancy encodings if your code is meant to be used in international * Don't use fancy encodings if your code is meant to be used in international
environments. Plain ASCII works best in any case. environments. Python's default, UTF-8, or even plain ASCII work best in any
case.
* Likewise, don't use non-ASCII characters in identifiers if there is only the
slightest chance people speaking a different language will read or maintain
the code.
.. rubric:: Footnotes .. rubric:: Footnotes

15
Doc/tutorial/datastructures.rst
View File

@ -162,12 +162,11 @@ Common applications are to make lists where each element is the result of
some operations applied to each member of the sequence, or to create a some operations applied to each member of the sequence, or to create a
subsequence of those elements that satisfy a certain condition. subsequence of those elements that satisfy a certain condition.
A list comprehension consists of brackets containing an expression followed
Each list comprehension consists of an expression followed by a :keyword:`for` by a :keyword:`for` clause, then zero or more :keyword:`for` or :keyword:`if`
clause, then zero or more :keyword:`for` or :keyword:`if` clauses. The result clauses. The result will be a list resulting from evaluating the expression in
will be a list resulting from evaluating the expression in the context of the the context of the :keyword:`for` and :keyword:`if` clauses which follow it. If
:keyword:`for` and :keyword:`if` clauses which follow it. If the expression the expression would evaluate to a tuple, it must be parenthesized.
would evaluate to a tuple, it must be parenthesized.
Here we take a list of numbers and return a list of three times each number:: Here we take a list of numbers and return a list of three times each number::
@ -348,8 +347,8 @@ The reverse operation is also possible::
>>> x, y, z = t >>> x, y, z = t
This is called, appropriately enough, *sequence unpacking* and works for any This is called, appropriately enough, *sequence unpacking* and works for any
sequence on the right-hand side. Sequence unpacking requires the list of sequence on the right-hand side. Sequence unpacking requires that there are as
variables on the left to have the same number of elements as the length of the many variables on the left side of the equals sign as there are elements in the
sequence. Note that multiple assignment is really just a combination of tuple sequence. Note that multiple assignment is really just a combination of tuple
packing and sequence unpacking. packing and sequence unpacking.