cpython (merge 3.5 -> default): Merge for issue #12484
https://hg.python.org/cpython/rev/f4aee46c79ca changeset: 99694:f4aee46c79ca parent: 99692:c6bd004671a7 parent: 99693:003f1f60a09c user: Brett Cannon <brett@python.org> date: Sun Dec 27 12:24:36 2015 -0800 summary: Merge for issue #12484 files: Doc/c-api/import.rst | 5 ----- Doc/faq/extending.rst | 14 -------------- Misc/ACKS | 1 + 3 files changed, 1 insertions(+), 19 deletions(-) diff --git a/Doc/c-api/import.rst b/Doc/c-api/import.rst --- a/Doc/c-api/import.rst +++ b/Doc/c-api/import.rst @@ -236,11 +236,6 @@ 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 diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst --- a/Doc/faq/extending.rst +++ b/Doc/faq/extending.rst @@ -247,20 +247,6 @@ 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"? ------------------------------------------------------ diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1313,6 +1313,7 @@ Denis Severson Ian Seyer Dmitry Shachnev +Anish Shah Daniel Shahaf Mark Shannon Ha Shao -- Repository URL: https://hg.python.org/cpython
participants (1)
-
brett.cannon