mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 03:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Recorded merge of revisions 74057 via svnmerge from

Browse source 
svn+ssh://svn.python.org/python/branches/py3k

(Only selected revisions.)

................
  r74057 | alexandre.vassalotti | 2009-07-17 12:42:05 +0200 (Fr, 17 Jul 2009) | 54 lines

  Merged revisions 73930-73932,73937-73939,73945,73951,73954,73962-73963,73970 via svnmerge from
  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
  ........
    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.
................
This commit is contained in:
Georg Brandl 2009-08-13 12:13:42 +00:00
parent ac73c5feae
commit a85ee5cfb6
5 changed files with 141 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Doc/c-api/import.rst
View file

@ -25,6 +25,8 @@ Importing Modules
imported module, or *NULL* with an exception set on failure. A failing
import of a module doesn't leave the module in :data:`sys.modules`.
This function always uses absolute imports.
.. cfunction:: PyObject* PyImport_ImportModuleNoBlock(const char *name)
@ -75,6 +77,8 @@ Importing Modules
current globals. This means that the import is done using whatever import
hooks are installed in the current environment.
This function always uses absolute imports.
.. cfunction:: PyObject* PyImport_ReloadModule(PyObject *m)