Skip to content

C
cpython
Kaydet (Commit) 8c4592a7 authored tarafından Nick Coghlan's avatar Nick Coghlan
Dosyalara gözat
Seçenekler

Backport some main.c cleanup from the py3k branch

üst 547867e1
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 12 deletions
Modules/main.c
Dosyayı görüntüle @ 8c4592a7
...@@ -181,27 +181,28 @@ static int RunMainFromImporter(char *filename) ...@@ -181,27 +181,28 @@ static int RunMainFromImporter(char *filename)
{ {
PyObject *argv0 = NULL, *importer = NULL; PyObject *argv0 = NULL, *importer = NULL;
if ( if ((argv0 = PyString_FromString(filename)) &&
(argv0 = PyString_FromString(filename)) && (importer = PyImport_GetImporter(argv0)) &&
(importer = PyImport_GetImporter(argv0)) && (importer->ob_type != &PyNullImporter_Type))
(importer->ob_type != &PyNullImporter_Type))
{ {
/* argv0 is usable as an import source, so /* argv0 is usable as an import source, so
put it in sys.path[0] and import __main__ */ put it in sys.path[0] and import __main__ */
PyObject *sys_path = NULL; PyObject *sys_path = NULL;
if ( if ((sys_path = PySys_GetObject("path")) &&
(sys_path = PySys_GetObject("path")) && !PyList_SetItem(sys_path, 0, argv0))
!PyList_SetItem(sys_path, 0, argv0) {
) {
Py_INCREF(argv0); Py_INCREF(argv0);
Py_CLEAR(importer); Py_DECREF(importer);
sys_path = NULL; sys_path = NULL;
return RunModule("__main__", 0) != 0; return RunModule("__main__", 0) != 0;
} }
} }
PyErr_Clear(); Py_XDECREF(argv0);
Py_CLEAR(argv0); Py_XDECREF(importer);
Py_CLEAR(importer); if (PyErr_Occurred()) {
PyErr_Print();
return 1;
}
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment