traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #15508: Fix the docstring for __import__ to not mention negative 

'level' values and set its document default value to 0.

Thanks to Arfrever Frehtes Taifersar Arahesis for filing the bug.
This commit is contained in:
Brett Cannon 2012-07-30 17:45:54 -04:00
parent 504ba313fc
commit 722d3aec2e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Misc/NEWS
View File

@ -10,6 +10,10 @@ What's New in Python 3.3.0 Beta 2?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #15508: Fix the docstring for __import__ to have the proper default
value of 0 for 'level' and to not mention negative levels since they are
not supported.
- Issue #15425: Eliminated traceback noise from more situations involving - Issue #15425: Eliminated traceback noise from more situations involving
importlib importlib

5
Python/bltinmodule.c
View File

@ -195,7 +195,7 @@ builtin___import__(PyObject *self, PyObject *args, PyObject *kwds)
} }
PyDoc_STRVAR(import_doc, PyDoc_STRVAR(import_doc,
"__import__(name, globals={}, locals={}, fromlist=[], level=-1) -> module\n\ "__import__(name, globals={}, locals={}, fromlist=[], level=0) -> module\n\
\n\ \n\
Import a module. Because this function is meant for use by the Python\n\ Import a module. Because this function is meant for use by the Python\n\
interpreter and not for general use it is better to use\n\ interpreter and not for general use it is better to use\n\
@ -208,8 +208,7 @@ empty list to emulate ``import name''.\n\
When importing a module from a package, note that __import__('A.B', ...)\n\ When importing a module from a package, note that __import__('A.B', ...)\n\
returns package A when fromlist is empty, but its submodule B when\n\ returns package A when fromlist is empty, but its submodule B when\n\
fromlist is not empty. Level is used to determine whether to perform \n\ fromlist is not empty. Level is used to determine whether to perform \n\
absolute or relative imports. -1 is the original strategy of attempting\n\ absolute or relative imports. 0 is absolute while a positive number\n\
both absolute and relative imports, 0 is absolute, a positive number\n\
is the number of parent directories to search relative to the current module."); is the number of parent directories to search relative to the current module.");