diff options
author | Georg Brandl <georg@python.org> | 2009-06-08 18:59:09 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2009-06-08 18:59:09 (GMT) |
commit | 7ae90dd22d4a8e2fbf49c4fd0be9cc88bb852fee (patch) | |
tree | 8971da88453ee050e573d749a6a4728da3487245 /Doc | |
parent | 1b8b7183abc265f3bc47a6ce9028eebdcb42b1f0 (diff) | |
download | cpython-7ae90dd22d4a8e2fbf49c4fd0be9cc88bb852fee.zip cpython-7ae90dd22d4a8e2fbf49c4fd0be9cc88bb852fee.tar.gz cpython-7ae90dd22d4a8e2fbf49c4fd0be9cc88bb852fee.tar.bz2 |
Elaborate encoding recommendations, and fix ambiguous wording for list comprehensions.
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/tutorial/controlflow.rst | 7 | ||||
-rw-r--r-- | Doc/tutorial/datastructures.rst | 15 |
2 files changed, 13 insertions, 9 deletions
diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst index e266a04..5e4de0e 100644 --- a/Doc/tutorial/controlflow.rst +++ b/Doc/tutorial/controlflow.rst @@ -675,7 +675,12 @@ extracted for you: (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 - 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 diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst index 02b08d9..c204075 100644 --- a/Doc/tutorial/datastructures.rst +++ b/Doc/tutorial/datastructures.rst @@ -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 subsequence of those elements that satisfy a certain condition. - -Each list comprehension consists of an expression followed by a :keyword:`for` -clause, then zero or more :keyword:`for` or :keyword:`if` clauses. The result -will be a list resulting from evaluating the expression in the context of the -:keyword:`for` and :keyword:`if` clauses which follow it. If the expression -would evaluate to a tuple, it must be parenthesized. +A list comprehension consists of brackets containing an expression followed +by a :keyword:`for` clause, then zero or more :keyword:`for` or :keyword:`if` +clauses. The result will be a list resulting from evaluating the expression in +the context of the :keyword:`for` and :keyword:`if` clauses which follow it. If +the expression 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:: @@ -348,8 +347,8 @@ The reverse operation is also possible:: >>> x, y, z = t This is called, appropriately enough, *sequence unpacking* and works for any -sequence on the right-hand side. Sequence unpacking requires the list of -variables on the left to have the same number of elements as the length of the +sequence on the right-hand side. Sequence unpacking requires that there are as +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 packing and sequence unpacking. |