From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 2 Feb 2018 13:32:19 +0000 (-0800)
Subject: bpo-32674: Improve the docstring for __import__ (GH-5339) (GH-5489)
X-Git-Tag: v3.6.5rc1~108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f61951b10cc08d3926a3ebaacc154d4149150ef4;p=python

bpo-32674: Improve the docstring for __import__ (GH-5339) (GH-5489)

Clarify that the level argument is used to determine whether to
perform absolute or relative imports: 0 is absolute, while a positive number
is the number of parent directories to search relative to the current module.
(cherry picked from commit 461d225b195eec5269f317323b41115516144c41)

Co-authored-by: oldk <oldk1331@users.noreply.github.com>
---

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 1960a095b8..5ee08e67e7 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -243,7 +243,7 @@ PyDoc_STRVAR(import_doc,
 "__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\
+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\
@@ -252,8 +252,8 @@ should be a list of names to emulate ``from name import ...'', or an\n\
 empty list to emulate ``import name''.\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\
-fromlist is not empty.  Level is used to determine whether to perform \n\
-absolute or relative imports. 0 is absolute while a positive number\n\
+fromlist is not empty.  The level argument is used to determine whether to\n\
+perform absolute or relative imports: 0 is absolute, while a positive number\n\
 is the number of parent directories to search relative to the current module.");