Commit 5305a998 authored by Brett Cannon's avatar Brett Cannon

Since __import__ is not designed for general use, have its docstring point

people towards importlib.import_module().

Closes issue #7397.
parent 1771b54b
...@@ -10,6 +10,9 @@ What's New in Python 3.2 Alpha 3? ...@@ -10,6 +10,9 @@ What's New in Python 3.2 Alpha 3?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #7397: Mention that importlib.import_module() is probably what someone
really wants to be using in __import__'s docstring.
- Issue #8521: Allow CreateKeyEx, OpenKeyEx, and DeleteKeyEx functions - Issue #8521: Allow CreateKeyEx, OpenKeyEx, and DeleteKeyEx functions
of winreg to use named arguments. of winreg to use named arguments.
......
...@@ -173,8 +173,12 @@ builtin___import__(PyObject *self, PyObject *args, PyObject *kwds) ...@@ -173,8 +173,12 @@ 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=-1) -> module\n\
\n\ \n\
Import a module. The globals are only used to determine the context;\n\ Import a module. Because this function is meant for use by the Python\n\
they are not modified. The locals are currently unused. The fromlist\n\ interpreter and not for general use it is better to use\n\
importlib.import_module() to programmatically import a module.\n\
\n\
The globals argument is only used to determine the context;\n\
they are not modified. The locals argument is unused. The fromlist\n\
should be a list of names to emulate ``from name import ...'', or an\n\ should be a list of names to emulate ``from name import ...'', or an\n\
empty list to emulate ``import name''.\n\ 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\
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment