cpython: f4aee46c79ca (original) (raw)

Mercurial > cpython

changeset 99694:f4aee46c79ca

Merge for issue #12484 [#12484]

Brett Cannon brett@python.org
date	Sun, 27 Dec 2015 12:24:36 -0800
parents	c6bd004671a7(current diff)003f1f60a09c(diff)
children	71f071f2e074
files	Misc/ACKS
diffstat	3 files changed, 1 insertions(+), 19 deletions(-)[+] [-] Doc/c-api/import.rst 5 Doc/faq/extending.rst 14 Misc/ACKS 1

line wrap: on

line diff

--- a/Doc/c-api/import.rst +++ b/Doc/c-api/import.rst @@ -236,11 +236,6 @@ Importing Modules For internal use only. -.. c:function:: PyObject* _PyImport_FixupExtension(char *, char *) -

For internal use only. -

- .. c:function:: int PyImport_ImportFrozenModuleObject(PyObject *name) Load a frozen module named name. Return 1 for success, 0 if the

--- a/Doc/faq/extending.rst +++ b/Doc/faq/extending.rst @@ -247,20 +247,6 @@ For Red Hat, install the python-devel RP For Debian, run apt-get install python-dev. -What does "SystemError: _PyImport_FixupExtension: module yourmodule not loaded" mean? -------------------------------------------------------------------------------------- - -This means that you have created an extension module named "yourmodule", but -your module init function does not initialize with that name. - -Every module init function will have a line similar to:: -

module = Py_InitModule("yourmodule", yourmodule_functions); -

-If the string passed to this function is not the same name as your extension -module, the :exc:SystemError exception will be raised. - - How do I tell "incomplete input" from "invalid input"? ------------------------------------------------------

--- a/Misc/ACKS +++ b/Misc/ACKS @@ -1313,6 +1313,7 @@ Pete Sevander Denis Severson Ian Seyer Dmitry Shachnev +Anish Shah Daniel Shahaf Mark Shannon Ha Shao