summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2011-06-20 00:41:01 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2011-06-20 00:41:01 (GMT)
commitbd4c321a3f7664e22ead9ea8ec55c10c10583905 (patch)
tree08ee9859ef922ce0648921e4614a2be9488c8e08 /Doc
parent110cac15232182ae32deb0bad1fbc63a2320e23d (diff)
parent5c0347b3989e7bf9fd78825a6bdd1fee7ad2a9dd (diff)
downloadcpython-bd4c321a3f7664e22ead9ea8ec55c10c10583905.zip
cpython-bd4c321a3f7664e22ead9ea8ec55c10c10583905.tar.gz
cpython-bd4c321a3f7664e22ead9ea8ec55c10c10583905.tar.bz2
merge from 3.2. Issue 12359
Diffstat (limited to 'Doc')
-rw-r--r--Doc/tutorial/modules.rst15
1 files changed, 8 insertions, 7 deletions
diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
index d4bfbda..2451fd5 100644
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -159,13 +159,14 @@ The Module Search Path
.. index:: triple: module; search; path
-When a module named :mod:`spam` is imported, the interpreter searches for a file
-named :file:`spam.py` in the current directory, and then in the list of
-directories specified by the environment variable :envvar:`PYTHONPATH`. This
-has the same syntax as the shell variable :envvar:`PATH`, that is, a list of
-directory names. When :envvar:`PYTHONPATH` is not set, or when the file is not
-found there, the search continues in an installation-dependent default path; on
-Unix, this is usually :file:`.:/usr/local/lib/python`.
+When a module named :mod:`spam` is imported, the interpreter searches for a
+file named :file:`spam.py` in the directory containing the input script (or
+the current directory), and then in the list of directories specified by the
+environment variable :envvar:`PYTHONPATH`. This has the same syntax as the
+shell variable :envvar:`PATH`, that is, a list of directory names. When
+:envvar:`PYTHONPATH` is not set, or when the file is not found there, the
+search continues in an installation-dependent default path; on Unix, this is
+usually :file:`.:/usr/local/lib/python`.
Actually, modules are searched in the list of directories given by the variable
``sys.path`` which is initialized from the directory containing the input script