summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-05-27 22:36:14 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-05-27 22:36:14 (GMT)
commitdfaaae980fe490acec49170245751a4f20bfeacd (patch)
treea136abd42ce2dbd906aa26d0d9e8d15dd8d2f963
parent3efc2fd479f024b70d9532cd4249ad6aaf8aba77 (diff)
downloadcpython-dfaaae980fe490acec49170245751a4f20bfeacd.zip
cpython-dfaaae980fe490acec49170245751a4f20bfeacd.tar.gz
cpython-dfaaae980fe490acec49170245751a4f20bfeacd.tar.bz2
Merged revisions 81572 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r81572 | benjamin.peterson | 2010-05-27 17:32:22 -0500 (Thu, 27 May 2010) | 1 line correct default value in signature ........
-rw-r--r--Doc/library/functions.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index ff999e9..5160e08 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1219,7 +1219,7 @@ are always available. They are listed here in alphabetical order.
True
-.. function:: __import__(name, globals={}, locals={}, fromlist=[], level=-1)
+.. function:: __import__(name, globals={}, locals={}, fromlist=[], level=0)
.. index::
statement: import