summaryrefslogtreecommitdiffstats
path: root/Doc/reference
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-10-19 08:06:26 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-10-19 08:06:26 (GMT)
commitf10644983e88c73437703a863151593cc37a657f (patch)
treeb3cf3ffcc4d27cf9f81c90efbedbc10a856db857 /Doc/reference
parent318909b297241f9c46f25815e12d05136da57fa9 (diff)
parente130a52d8a60229f53c8bc2ea7a1f51ee592bbd7 (diff)
downloadcpython-f10644983e88c73437703a863151593cc37a657f.zip
cpython-f10644983e88c73437703a863151593cc37a657f.tar.gz
cpython-f10644983e88c73437703a863151593cc37a657f.tar.bz2
Merge with 3.2.
Diffstat (limited to 'Doc/reference')
-rw-r--r--Doc/reference/compound_stmts.rst2
-rw-r--r--Doc/reference/toplevel_components.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
index 8151a0a..e7a6f18 100644
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -478,7 +478,7 @@ value --- this is a syntactic restriction that is not expressed by the grammar.
**Default parameter values are evaluated when the function definition is
executed.** This means that the expression is evaluated once, when the function
-is defined, and that that same "pre-computed" value is used for each call. This
+is defined, and that the same "pre-computed" value is used for each call. This
is especially important to understand when a default parameter is a mutable
object, such as a list or a dictionary: if the function modifies the object
(e.g. by appending an item to a list), the default value is in effect modified.
diff --git a/Doc/reference/toplevel_components.rst b/Doc/reference/toplevel_components.rst
index 21f801c..f4bc71f 100644
--- a/Doc/reference/toplevel_components.rst
+++ b/Doc/reference/toplevel_components.rst
@@ -111,6 +111,6 @@ string argument to :func:`eval` must have the following form:
single: input; raw
single: readline() (file method)
-Note: to read 'raw' input line without interpretation, you can use the the
+Note: to read 'raw' input line without interpretation, you can use the
:meth:`readline` method of file objects, including ``sys.stdin``.