mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 73930-73932,73937-73939,73945,73951,73954,73962-73963,73970 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73930 | amaury.forgeotdarc | 2009-07-10 12:47:42 -0400 (Fri, 10 Jul 2009) | 2 lines

  #6447: typo in subprocess docstring
........
  r73931 | ezio.melotti | 2009-07-10 16:25:56 -0400 (Fri, 10 Jul 2009) | 1 line

  more cleanups and if zlib -> skipUnless(zlib)
........
  r73932 | kristjan.jonsson | 2009-07-11 04:44:43 -0400 (Sat, 11 Jul 2009) | 3 lines

  http://bugs.python.org/issue6460
  Need to be careful with thread switching when testing the xmlrpc server.  The server thread may not have updated stats when the client thread tests them.
........
  r73937 | georg.brandl | 2009-07-11 06:12:36 -0400 (Sat, 11 Jul 2009) | 1 line

  Fix style.
........
  r73938 | georg.brandl | 2009-07-11 06:14:54 -0400 (Sat, 11 Jul 2009) | 1 line

  #6446: fix import_spam() function to use correct error and reference handling.
........
  r73939 | georg.brandl | 2009-07-11 06:18:10 -0400 (Sat, 11 Jul 2009) | 1 line

  #6448: clarify docs for find_module().
........
  r73945 | georg.brandl | 2009-07-11 06:51:31 -0400 (Sat, 11 Jul 2009) | 1 line

  #6456: clarify the meaning of constants used as arguments to nl_langinfo().
........
  r73951 | georg.brandl | 2009-07-11 10:23:38 -0400 (Sat, 11 Jul 2009) | 2 lines

  array.array is actually a class.
........
  r73954 | tarek.ziade | 2009-07-11 13:21:00 -0400 (Sat, 11 Jul 2009) | 1 line

  reverted changes for #6459 (doesn't apply on 2.x)
........
  r73962 | benjamin.peterson | 2009-07-11 18:15:13 -0400 (Sat, 11 Jul 2009) | 1 line

  put downloaded test support files in Lib/test/data instead of the cwd
........
  r73963 | benjamin.peterson | 2009-07-11 18:25:24 -0400 (Sat, 11 Jul 2009) | 1 line

  ignore things in Lib/test/data/
........
  r73970 | hirokazu.yamamoto | 2009-07-11 22:04:47 -0400 (Sat, 11 Jul 2009) | 1 line

  Fixed distutils test.
........
This commit is contained in:
Alexandre Vassalotti 2009-07-17 10:42:05 +00:00
parent ea3714e689
commit 711ed4aedf
10 changed files with 148 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Doc/library/imp.rst
View file

@ -33,16 +33,17 @@ This module provides an interface to the mechanisms used to implement the
.. function:: find_module(name[, path])
Try to find the module *name* on the search path *path*. If *path* is a list
of directory names, each directory is searched for files with any of the
suffixes returned by :func:`get_suffixes` above. Invalid names in the list
are silently ignored (but all list items must be strings). If *path* is
omitted or ``None``, the list of directory names given by ``sys.path`` is
searched, but first it searches a few special places: it tries to find a
built-in module with the given name (:const:`C_BUILTIN`), then a frozen
module (:const:`PY_FROZEN`), and on some systems some other places are looked
in as well (on Windows, it looks in the registry which may point to a
specific file).
Try to find the module *name*. If *path* is omitted or ``None``, the list of
directory names given by ``sys.path`` is searched, but first a few special
places are searched: the function tries to find a built-in module with the
given name (:const:`C_BUILTIN`), then a frozen module (:const:`PY_FROZEN`),
and on some systems some other places are looked in as well (on Windows, it
looks in the registry which may point to a specific file).
Otherwise, *path* must be a list of directory names; each directory is
searched for files with any of the suffixes returned by :func:`get_suffixes`
above. Invalid names in the list are silently ignored (but all list items
must be strings).
If search is successful, the return value is a 3-element tuple ``(file,
pathname, description)``: