[Python-checkins] cpython (merge 3.4 -> default): Issue #21439: Merge with 3.4

zach.ware python-checkins at python.org
Tue Jun 3 16:35:03 CEST 2014


http://hg.python.org/cpython/rev/99b469758f49
changeset:   90996:99b469758f49
parent:      90994:7ea84a25d863
parent:      90995:be8492101251
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue Jun 03 09:34:39 2014 -0500
summary:
  Issue #21439: Merge with 3.4

files:
  Doc/reference/compound_stmts.rst |  2 +-
  Doc/reference/expressions.rst    |  4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -180,7 +180,7 @@
    for i in range(10):
        print(i)
        i = 5             # this will not affect the for-loop
-                         # be i will be overwritten with the next
+                         # because i will be overwritten with the next
                          # index in the range
 
 
diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -522,7 +522,7 @@
 The primary must evaluate to an object of a type that supports attribute
 references, which most objects do.  This object is then asked to produce the
 attribute whose name is the identifier.  This production can be customized by
-overriding the :meth:`__getattr__` method).  If this attribute is not available,
+overriding the :meth:`__getattr__` method.  If this attribute is not available,
 the exception :exc:`AttributeError` is raised.  Otherwise, the type and value of
 the object produced is determined by the object.  Multiple evaluations of the
 same attribute reference may yield different objects.
@@ -1253,7 +1253,7 @@
    lambda_expr: "lambda" [`parameter_list`]: `expression`
    lambda_expr_nocond: "lambda" [`parameter_list`]: `expression_nocond`
 
-Lambda expressions (sometimes called lambda forms) are create anonymous
+Lambda expressions (sometimes called lambda forms) are used to create anonymous
 functions. The expression ``lambda arguments: expression`` yields a function
 object.  The unnamed object behaves like a function object defined with ::
 

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list