summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Kuchling <amk@amk.ca>2013-06-21 01:20:20 (GMT)
committerAndrew Kuchling <amk@amk.ca>2013-06-21 01:20:20 (GMT)
commitf862dc53e873e6fd655aa2872cc0081ab8d43e91 (patch)
treee625aebedf9af4a816450a9f25d871428ed893e9
parent854ffcb6f34222c19b3514bb71381ab706777e80 (diff)
parent1d7d580d0edc2884a32a8592f2f3a098d8397740 (diff)
downloadcpython-f862dc53e873e6fd655aa2872cc0081ab8d43e91.zip
cpython-f862dc53e873e6fd655aa2872cc0081ab8d43e91.tar.gz
cpython-f862dc53e873e6fd655aa2872cc0081ab8d43e91.tar.bz2
Merge from 3.3
-rw-r--r--Doc/library/imp.rst2
-rw-r--r--Doc/library/itertools.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst
index 08e80ab..5253e69 100644
--- a/Doc/library/imp.rst
+++ b/Doc/library/imp.rst
@@ -165,7 +165,7 @@ This module provides an interface to the mechanisms used to implement the
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
index 7099fa0..a0745d7 100644
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -762,7 +762,7 @@ which incur interpreter overhead.
""" 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: