[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3

[andrew.kuchling]

http://hg.python.org/cpython/rev/c1f537c4a8e5
changeset:   84231:c1f537c4a8e5
parent:      84229:ad8a184916fc
parent:      84230:b805506b11e0
user:        Andrew Kuchling <amk at amk.ca>
date:        Thu Jun 20 21:20:20 2013 -0400
summary:
  Merge from 3.3

files:
  Doc/library/imp.rst       |  2 +-
  Doc/library/itertools.rst |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst
--- a/Doc/library/imp.rst
+++ b/Doc/library/imp.rst
@@ -165,7 +165,7 @@
           cache = {}
 
    It is legal though generally not very useful to reload built-in or dynamically
-   loaded modules, except for :mod:`sys`, :mod:`__main__` and :mod:`__builtin__`.
+   loaded modules, except for :mod:`sys`, :mod:`__main__` and :mod:`builtins`.
    In many cases, however, extension modules are not designed to be initialized
    more than once, and may fail in arbitrary ways when reloaded.
 
diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -762,7 +762,7 @@
        """ Call a function repeatedly until an exception is raised.
 
        Converts a call-until-exception interface to an iterator interface.
-       Like __builtin__.iter(func, sentinel) but uses an exception instead
+       Like builtins.iter(func, sentinel) but uses an exception instead
        of a sentinel to end the loop.
 
        Examples:

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