From: Nick Coghlan Date: Tue, 20 Nov 2007 14:55:57 +0000 (+0000) Subject: Backport some main.c cleanup from the py3k branch X-Git-Tag: v2.6a1~1032 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c4592a77ae6b71a4bab8d40bbdcea72a6378cb4;p=python Backport some main.c cleanup from the py3k branch --- diff --git a/Modules/main.c b/Modules/main.c index 4b06acb3c5..26f8780e72 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -181,27 +181,28 @@ static int RunMainFromImporter(char *filename) { PyObject *argv0 = NULL, *importer = NULL; - if ( - (argv0 = PyString_FromString(filename)) && - (importer = PyImport_GetImporter(argv0)) && - (importer->ob_type != &PyNullImporter_Type)) + if ((argv0 = PyString_FromString(filename)) && + (importer = PyImport_GetImporter(argv0)) && + (importer->ob_type != &PyNullImporter_Type)) { /* argv0 is usable as an import source, so put it in sys.path[0] and import __main__ */ PyObject *sys_path = NULL; - if ( - (sys_path = PySys_GetObject("path")) && - !PyList_SetItem(sys_path, 0, argv0) - ) { + if ((sys_path = PySys_GetObject("path")) && + !PyList_SetItem(sys_path, 0, argv0)) + { Py_INCREF(argv0); - Py_CLEAR(importer); + Py_DECREF(importer); sys_path = NULL; return RunModule("__main__", 0) != 0; } } - PyErr_Clear(); - Py_CLEAR(argv0); - Py_CLEAR(importer); + Py_XDECREF(argv0); + Py_XDECREF(importer); + if (PyErr_Occurred()) { + PyErr_Print(); + return 1; + } return -1; }