From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 25 Apr 2020 05:45:48 +0000 (-0700)
Subject: bpo-40279: Add some error-handling to the module initialisation docs example (GH... 
X-Git-Tag: v3.8.3rc1~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=882a7f44da08c6fb210bd9a17f80903cbca84034;p=thirdparty%2FPython%2Fcpython.git

bpo-40279: Add some error-handling to the module initialisation docs example (GH-19705) (GH-19710)

(cherry picked from commit d4f3923d5901ef1ccdbe6ad6c5a753af90832a0f)

Co-authored-by: Cajetan Rodrigues <caje731@gmail.com>
---

diff --git a/Doc/extending/extending.rst b/Doc/extending/extending.rst
index 5b32a2cdc550..25dc2934d29e 100644
--- a/Doc/extending/extending.rst
+++ b/Doc/extending/extending.rst
@@ -395,18 +395,26 @@ optionally followed by an import of the module::
        }
 
        /* Add a built-in module, before Py_Initialize */
-       PyImport_AppendInittab("spam", PyInit_spam);
+       if (PyImport_AppendInittab("spam", PyInit_spam) == -1) {
+           fprintf(stderr, "Error: could not extend in-built modules table\n");
+           exit(1);
+       }
 
        /* Pass argv[0] to the Python interpreter */
        Py_SetProgramName(program);
 
-       /* Initialize the Python interpreter.  Required. */
+       /* Initialize the Python interpreter.  Required.
+          If this step fails, it will be a fatal error. */
        Py_Initialize();
 
        /* Optionally import the module; alternatively,
           import can be deferred until the embedded script
           imports it. */
-       PyImport_ImportModule("spam");
+       pmodule = PyImport_ImportModule("spam");
+       if (!pmodule) {
+           PyErr_Print();
+           fprintf(stderr, "Error: could not import module 'spam'\n");
+       }
 
        ...