Merged revisions 82835 via svnmerge from

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

........
  r82835 | mark.dickinson | 2010-07-12 10:37:40 +0100 (Mon, 12 Jul 2010) | 1 line

  Remove mention of execfile from the tutorial.
........

diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst
index 1ba6bb0ee6df7bbccc03e8813c67871d9e6475a8..27d0896eb7cfe33b43329bd1152b1525950114d9 100644 (file)
--- a/Doc/tutorial/classes.rst
+++ b/Doc/tutorial/classes.rst
@@ -599,12 +599,12 @@ 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
 even be useful in special circumstances, such as in the debugger.
 
-Notice that code passed to ``exec()``, ``eval()`` or ``execfile()`` does not
-consider the classname of the invoking  class to be the current class; this is
-similar to the effect of the  ``global`` statement, the effect of which is
-likewise restricted to  code that is byte-compiled together.  The same
-restriction applies to ``getattr()``, ``setattr()`` and ``delattr()``, as well
-as when referencing ``__dict__`` directly.
+Notice that code passed to ``exec()`` or ``eval()`` does not consider the
+classname of the invoking class to be the current class; this is similar to the
+effect of the ``global`` statement, the effect of which is likewise restricted
+to code that is byte-compiled together.  The same restriction applies to
+``getattr()``, ``setattr()`` and ``delattr()``, as well as when referencing
+``__dict__`` directly.
 
 
 .. _tut-odds: