summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2011-06-20 14:33:25 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2011-06-20 14:33:25 (GMT)
commit1dbb7591dad2b8a59cc856f1784aba1c8207012b (patch)
tree854eaf4da34e74f1e56ef159c26fc03840a03e98
parent925ef39949b784d331dbb246b8888347ecd8b275 (diff)
parent4707a998e4a0a0587dd6265e0c8c64588ab23712 (diff)
downloadcpython-1dbb7591dad2b8a59cc856f1784aba1c8207012b.zip
cpython-1dbb7591dad2b8a59cc856f1784aba1c8207012b.tar.gz
cpython-1dbb7591dad2b8a59cc856f1784aba1c8207012b.tar.bz2
merge from 3.2 - Fix closes Issue12359 - Removing a confusing sentence from the previous change.
-rw-r--r--Doc/tutorial/modules.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
index 2451fd5..3254a80 100644
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -160,13 +160,13 @@ 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 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`.
+file named :file:`spam.py` in the directory containing the input script 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