1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make test_cmd_line_scripts pass by using a unicode string instead of

Browse Source 
a bytes string to hold argv0 in RunMainFromImporter().
Also changed the code lay-out a bit to be more readable (for me :-),
and print any unexpected errors rather than suppressing them.
This commit is contained in:
Guido van Rossum 2007-11-19 18:36:41 +00:00
parent 82f013bb58
commit 74c29c71b1
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Modules/main.c
View File

@ -187,28 +187,31 @@ static int RunMainFromImporter(char *filename)
{ {
PyObject *argv0 = NULL, *importer = NULL; PyObject *argv0 = NULL, *importer = NULL;
if ( if ((argv0 = PyUnicode_DecodeFSDefault(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()) {
return -1; PyErr_Print();
return 1;
}
else {
return -1;
}
} }
@ -590,4 +593,3 @@ Py_GetArgcArgv(int *argc, char ***argv)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif