[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2

Wed Jan 11 20:57:47 CET 2012

http://hg.python.org/cpython/rev/7568134ac6cf
changeset: 74337:7568134ac6cf
parent: 74334:fb0d61fd1753
parent: 74336:32ea3675fba2
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Wed Jan 11 14:56:22 2012 -0500
summary:
 Merge with 3.2
files:
 Doc/tutorial/classes.rst | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst
--- a/Doc/tutorial/classes.rst
+++ b/Doc/tutorial/classes.rst
@@ -458,8 +458,8 @@
 self.add(x)
 
 Methods may reference global names in the same way as ordinary functions. The
-global scope associated with a method is the module containing the class
-definition. (The class itself is never used as a global scope.) While one
+global scope associated with a method is the module containing its
+definition. (A class is never used as a global scope.) While one
 rarely encounters a good reason for using global data in a method, there are
 many legitimate uses of the global scope: for one thing, functions and modules
 imported into the global scope can be used by methods, as well as functions and
-- 
Repository URL: http://hg.python.org/cpython
