diff options
author | Benjamin Peterson <benjamin@python.org> | 2012-08-06 17:53:19 -0700 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2012-08-06 17:53:19 -0700 |
commit | 0ed05059ded079b1c239187e9cc1bee37cf9bead (patch) | |
tree | 3e77170b16f6379e0ebf19af6b4ac2566bd2c796 /Python/bltinmodule.c | |
parent | b37df519c793d40718fda78a9961811fae973f36 (diff) | |
parent | d340b43d7524338ce3d63d4bd69477fca7dad23c (diff) | |
download | cpython-git-0ed05059ded079b1c239187e9cc1bee37cf9bead.tar.gz |
merge heads
Diffstat (limited to 'Python/bltinmodule.c')
-rw-r--r-- | Python/bltinmodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 3617b5a056..e6511a1ae6 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -195,7 +195,7 @@ builtin___import__(PyObject *self, PyObject *args, PyObject *kwds) } PyDoc_STRVAR(import_doc, -"__import__(name, globals={}, locals={}, fromlist=[], level=0) -> module\n\ +"__import__(name, globals=None, locals=None, fromlist=(), level=0) -> module\n\ \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\ |