[Python-checkins] cpython (merge 3.3 -> default): #17363: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/75c0cb169be5
changeset:   82505:75c0cb169be5
parent:      82503:583a0321c7b9
parent:      82504:29d5bc1226f9
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed Mar 06 02:59:25 2013 +0200
summary:
  #17363: merge with 3.3.

files:
  Doc/c-api/module.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/c-api/module.rst b/Doc/c-api/module.rst
--- a/Doc/c-api/module.rst
+++ b/Doc/c-api/module.rst
@@ -122,7 +122,7 @@
    :c:func:`PyState_AddModule` beforehand. In case the corresponding module object is not
    found or has not been attached to the interpreter state yet, it returns NULL.
 
-.. c:function:: int PyState_AddModule(PyModuleDef *def, PyObject *module)
+.. c:function:: int PyState_AddModule(PyObject *module, PyModuleDef *def)
 
    Attaches the module object passed to the function to the interpreter state. This allows
    the module object to be accessible via
@@ -130,7 +130,7 @@
 
    .. versionadded:: 3.3
 
-.. c:function:: int PyState_RemoveModule(PyModuleDef *def, PyObject *module)
+.. c:function:: int PyState_RemoveModule(PyModuleDef *def)
 
    Removes the module object created from *def* from the interpreter state.
 

-- 
Repository URL: http://hg.python.org/cpython