Merged revisions 74412 via svnmerge from

svn+ssh://svn.python.org/python/branches/py3k

................
  r74412 | georg.brandl | 2009-08-13 14:58:30 +0200 (Do, 13 Aug 2009) | 9 lines

  Merged revisions 74411 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r74411 | georg.brandl | 2009-08-13 14:57:25 +0200 (Do, 13 Aug 2009) | 2 lines

    Remove potentially confusing sentence in __mangling description.
  ........
................

diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst
index bdc49c49adc0ee02ea575d97729c2c2d3050a4f7..7ef41532a685f95023c75b78d546b6fa65639857 100644 (file)
--- a/Doc/tutorial/classes.rst
+++ b/Doc/tutorial/classes.rst
@@ -592,11 +592,8 @@ such a mechanism, called :dfn:`name mangling`.  Any identifier of the form
 ``__spam`` (at least two leading underscores, at most one trailing underscore)
 is textually replaced with ``_classname__spam``, where ``classname`` is the
 current class name with leading underscore(s) stripped.  This mangling is done
-without regard to the syntactic position of the identifier, so it can be used to
-define class-private instance and class variables, methods, variables stored in
-globals, and even variables stored in instances.  Truncation may occur when the
-mangled name would be longer than 255 characters.  Outside classes, or when the
-class name consists of only underscores, no mangling occurs.
+without regard to the syntactic position of the identifier, as long as it
+occurs within the definition of a class.
 
 Note that the mangling rules are designed mostly to avoid accidents; it still is
 possible to access or modify a variable that is considered private.  This can