[Python-checkins] r81574 - in python/branches/release31-maint: Doc/library/functions.rst

[benjamin.peterson]

Author: benjamin.peterson
Date: Fri May 28 00:36:14 2010
New Revision: 81574

Log:
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
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/functions.rst

Modified: python/branches/release31-maint/Doc/library/functions.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/functions.rst	(original)
+++ python/branches/release31-maint/Doc/library/functions.rst	Fri May 28 00:36:14 2010
@@ -1219,7 +1219,7 @@
       True
 
 
-.. function:: __import__(name, globals={}, locals={}, fromlist=[], level=-1)
+.. function:: __import__(name, globals={}, locals={}, fromlist=[], level=0)
 
    .. index::
       statement: import