cpython-lru_cache-weakref: Python/pythonrun.c comparison

comparison Python/pythonrun.c @ 61463:fd25030223b0 legacy-trunk

Untabify C files. Will watch buildbots.

author	Antoine Pitrou <solipsis@pitrou.net>
date	Sun, 09 May 2010 14:46:46 +0000
parents	435a8355dab6
children	bd5f5df7ed78

comparison

equal deleted inserted replaced

-:d698fb056a45
+:fd25030223b0
 #endif
 #ifndef Py_REF_DEBUG
 #define PRINT_TOTAL_REFS()
 #else /* Py_REF_DEBUG */
-#define PRINT_TOTAL_REFS() fprintf(stderr,				\
+#define PRINT_TOTAL_REFS() fprintf(stderr,                              \
-				   "[%" PY_FORMAT_SIZE_T "d refs]\n",	\
+"[%" PY_FORMAT_SIZE_T "d refs]\n",                   \
-				   _Py_GetRefTotal())
+_Py_GetRefTotal())
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif
 /* Forward */
 static void initmain(void);
 static void initsite(void);
 static PyObject *run_mod(mod_ty, const char *, PyObject *, PyObject *,
-			  PyCompilerFlags *, PyArena *);
+PyCompilerFlags *, PyArena *);
 static PyObject *run_pyc_file(FILE *, const char *, PyObject *, PyObject *,
-			      PyCompilerFlags *);
+PyCompilerFlags *);
 static void err_input(perrdetail *);
 static void initsigs(void);
 static void wait_for_thread_shutdown(void);
 static void call_sys_exitfunc(void);
 static void call_ll_exitfuncs(void);
 /* PyModule_GetWarningsModule is no longer necessary as of 2.6
 since _warnings is builtin.  This API should not be used. */
 PyObject *
 PyModule_GetWarningsModule(void)
 {
-	return PyImport_ImportModule("warnings");
+return PyImport_ImportModule("warnings");
 }
 static int initialized = 0;
 /* API to access the initialized flag -- useful for esoteric use */
 int
 Py_IsInitialized(void)
 {
-	return initialized;
+return initialized;
 }
 /* Global initializations.  Can be undone by Py_Finalize().  Don't
 call this twice without an intervening Py_Finalize() call.  When
 initializations fail, a fatal error is issued and the function does
 */
 static int
 add_flag(int flag, const char *envs)
 {
-	int env = atoi(envs);
+int env = atoi(envs);
-	if (flag < env)
+if (flag < env)
-		flag = env;
+flag = env;
-	if (flag < 1)
+if (flag < 1)
-		flag = 1;
+flag = 1;
-	return flag;
+return flag;
 }
 void
 Py_InitializeEx(int install_sigs)
 {
-	PyInterpreterState *interp;
+PyInterpreterState *interp;
-	PyThreadState *tstate;
+PyThreadState *tstate;
-	PyObject *bimod, *sysmod;
+PyObject *bimod, *sysmod;
-	char *p;
+char *p;
-	char *icodeset = NULL; /* On Windows, input codeset may theoretically
+char *icodeset = NULL; /* On Windows, input codeset may theoretically
-			          differ from output codeset. */
+differ from output codeset. */
-	char *codeset = NULL;
+char *codeset = NULL;
-	char *errors = NULL;
+char *errors = NULL;
-	int free_codeset = 0;
+int free_codeset = 0;
-	int overridden = 0;
+int overridden = 0;
-	PyObject *sys_stream, *sys_isatty;
+PyObject *sys_stream, *sys_isatty;
 #if defined(Py_USING_UNICODE) && defined(HAVE_LANGINFO_H) && defined(CODESET)
-	char *saved_locale, *loc_codeset;
+char *saved_locale, *loc_codeset;
 #endif
 #ifdef MS_WINDOWS
-	char ibuf[128];
+char ibuf[128];
-	char buf[128];
+char buf[128];
 #endif
-	extern void _Py_ReadyTypes(void);
+extern void _Py_ReadyTypes(void);
-	if (initialized)
+if (initialized)
-		return;
+return;
-	initialized = 1;
+initialized = 1;
-	if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0')
+if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0')
-		Py_DebugFlag = add_flag(Py_DebugFlag, p);
+Py_DebugFlag = add_flag(Py_DebugFlag, p);
-	if ((p = Py_GETENV("PYTHONVERBOSE")) && *p != '\0')
+if ((p = Py_GETENV("PYTHONVERBOSE")) && *p != '\0')
-		Py_VerboseFlag = add_flag(Py_VerboseFlag, p);
+Py_VerboseFlag = add_flag(Py_VerboseFlag, p);
-	if ((p = Py_GETENV("PYTHONOPTIMIZE")) && *p != '\0')
+if ((p = Py_GETENV("PYTHONOPTIMIZE")) && *p != '\0')
-		Py_OptimizeFlag = add_flag(Py_OptimizeFlag, p);
+Py_OptimizeFlag = add_flag(Py_OptimizeFlag, p);
-	if ((p = Py_GETENV("PYTHONDONTWRITEBYTECODE")) && *p != '\0')
+if ((p = Py_GETENV("PYTHONDONTWRITEBYTECODE")) && *p != '\0')
-		Py_DontWriteBytecodeFlag = add_flag(Py_DontWriteBytecodeFlag, p);
+Py_DontWriteBytecodeFlag = add_flag(Py_DontWriteBytecodeFlag, p);
-	interp = PyInterpreterState_New();
+interp = PyInterpreterState_New();
-	if (interp == NULL)
+if (interp == NULL)
-		Py_FatalError("Py_Initialize: can't make first interpreter");
+Py_FatalError("Py_Initialize: can't make first interpreter");
-	tstate = PyThreadState_New(interp);
+tstate = PyThreadState_New(interp);
-	if (tstate == NULL)
+if (tstate == NULL)
-		Py_FatalError("Py_Initialize: can't make first thread");
+Py_FatalError("Py_Initialize: can't make first thread");
-	(void) PyThreadState_Swap(tstate);
+(void) PyThreadState_Swap(tstate);
-	_Py_ReadyTypes();
+_Py_ReadyTypes();
-	if (!_PyFrame_Init())
+if (!_PyFrame_Init())
-		Py_FatalError("Py_Initialize: can't init frames");
+Py_FatalError("Py_Initialize: can't init frames");
-	if (!_PyInt_Init())
+if (!_PyInt_Init())
-		Py_FatalError("Py_Initialize: can't init ints");
+Py_FatalError("Py_Initialize: can't init ints");
-	if (!_PyLong_Init())
+if (!_PyLong_Init())
-		Py_FatalError("Py_Initialize: can't init longs");
+Py_FatalError("Py_Initialize: can't init longs");
-	if (!PyByteArray_Init())
+if (!PyByteArray_Init())
-		Py_FatalError("Py_Initialize: can't init bytearray");
+Py_FatalError("Py_Initialize: can't init bytearray");
-	_PyFloat_Init();
+_PyFloat_Init();
-	interp->modules = PyDict_New();
+interp->modules = PyDict_New();
-	if (interp->modules == NULL)
+if (interp->modules == NULL)
-		Py_FatalError("Py_Initialize: can't make modules dictionary");
+Py_FatalError("Py_Initialize: can't make modules dictionary");
-	interp->modules_reloading = PyDict_New();
+interp->modules_reloading = PyDict_New();
-	if (interp->modules_reloading == NULL)
+if (interp->modules_reloading == NULL)
-		Py_FatalError("Py_Initialize: can't make modules_reloading dictionary");
+Py_FatalError("Py_Initialize: can't make modules_reloading dictionary");
 #ifdef Py_USING_UNICODE
-	/* Init Unicode implementation; relies on the codec registry */
+/* Init Unicode implementation; relies on the codec registry */
-	_PyUnicode_Init();
+_PyUnicode_Init();
 #endif
-	bimod = _PyBuiltin_Init();
+bimod = _PyBuiltin_Init();
-	if (bimod == NULL)
+if (bimod == NULL)
-		Py_FatalError("Py_Initialize: can't initialize __builtin__");
+Py_FatalError("Py_Initialize: can't initialize __builtin__");
-	interp->builtins = PyModule_GetDict(bimod);
+interp->builtins = PyModule_GetDict(bimod);
-	if (interp->builtins == NULL)
+if (interp->builtins == NULL)
-		Py_FatalError("Py_Initialize: can't initialize builtins dict");
+Py_FatalError("Py_Initialize: can't initialize builtins dict");
-	Py_INCREF(interp->builtins);
+Py_INCREF(interp->builtins);
-	sysmod = _PySys_Init();
+sysmod = _PySys_Init();
-	if (sysmod == NULL)
+if (sysmod == NULL)
-		Py_FatalError("Py_Initialize: can't initialize sys");
+Py_FatalError("Py_Initialize: can't initialize sys");
-	interp->sysdict = PyModule_GetDict(sysmod);
+interp->sysdict = PyModule_GetDict(sysmod);
-	if (interp->sysdict == NULL)
+if (interp->sysdict == NULL)
-		Py_FatalError("Py_Initialize: can't initialize sys dict");
+Py_FatalError("Py_Initialize: can't initialize sys dict");
-	Py_INCREF(interp->sysdict);
+Py_INCREF(interp->sysdict);
-	_PyImport_FixupExtension("sys", "sys");
+_PyImport_FixupExtension("sys", "sys");
-	PySys_SetPath(Py_GetPath());
+PySys_SetPath(Py_GetPath());
-	PyDict_SetItemString(interp->sysdict, "modules",
+PyDict_SetItemString(interp->sysdict, "modules",
-			     interp->modules);
+interp->modules);
-	_PyImport_Init();
+_PyImport_Init();
-	/* initialize builtin exceptions */
+/* initialize builtin exceptions */
-	_PyExc_Init();
+_PyExc_Init();
-	_PyImport_FixupExtension("exceptions", "exceptions");
+_PyImport_FixupExtension("exceptions", "exceptions");
-	/* phase 2 of builtins */
+/* phase 2 of builtins */
-	_PyImport_FixupExtension("__builtin__", "__builtin__");
+_PyImport_FixupExtension("__builtin__", "__builtin__");
-	_PyImportHooks_Init();
+_PyImportHooks_Init();
-	if (install_sigs)
+if (install_sigs)
-		initsigs(); /* Signal handling stuff, including initintr() */
+initsigs(); /* Signal handling stuff, including initintr() */
-	/* Initialize warnings. */
+/* Initialize warnings. */
-	_PyWarnings_Init();
+_PyWarnings_Init();
-	if (PySys_HasWarnOptions()) {
+if (PySys_HasWarnOptions()) {
-		PyObject *warnings_module = PyImport_ImportModule("warnings");
+PyObject *warnings_module = PyImport_ImportModule("warnings");
-		if (!warnings_module)
+if (!warnings_module)
-			PyErr_Clear();
+PyErr_Clear();
-		Py_XDECREF(warnings_module);
+Py_XDECREF(warnings_module);
-	}
+}
-	initmain(); /* Module __main__ */
+initmain(); /* Module __main__ */
-	/* auto-thread-state API, if available */
+/* auto-thread-state API, if available */
 #ifdef WITH_THREAD
-	_PyGILState_Init(interp, tstate);
+_PyGILState_Init(interp, tstate);
 #endif /* WITH_THREAD */
-	if (!Py_NoSiteFlag)
+if (!Py_NoSiteFlag)
-		initsite(); /* Module site */
+initsite(); /* Module site */
-	if ((p = Py_GETENV("PYTHONIOENCODING")) && *p != '\0') {
+if ((p = Py_GETENV("PYTHONIOENCODING")) && *p != '\0') {
-		p = icodeset = codeset = strdup(p);
+p = icodeset = codeset = strdup(p);
-		free_codeset = 1;
+free_codeset = 1;
-		errors = strchr(p, ':');
+errors = strchr(p, ':');
-		if (errors) {
+if (errors) {
-			*errors = '\0';
+*errors = '\0';
-			errors++;
+errors++;
-		}
+}
-		overridden = 1;
+overridden = 1;
-	}
+}
 #if defined(Py_USING_UNICODE) && defined(HAVE_LANGINFO_H) && defined(CODESET)
-	/* On Unix, set the file system encoding according to the
+/* On Unix, set the file system encoding according to the
-	   user's preference, if the CODESET names a well-known
+user's preference, if the CODESET names a well-known
-	   Python codec, and Py_FileSystemDefaultEncoding isn't
+Python codec, and Py_FileSystemDefaultEncoding isn't
-	   initialized by other means. Also set the encoding of
+initialized by other means. Also set the encoding of
-	   stdin and stdout if these are terminals, unless overridden.  */
+stdin and stdout if these are terminals, unless overridden.  */
-	if (!overridden || !Py_FileSystemDefaultEncoding) {
+if (!overridden || !Py_FileSystemDefaultEncoding) {
-		saved_locale = strdup(setlocale(LC_CTYPE, NULL));
+saved_locale = strdup(setlocale(LC_CTYPE, NULL));
-		setlocale(LC_CTYPE, "");
+setlocale(LC_CTYPE, "");
-		loc_codeset = nl_langinfo(CODESET);
+loc_codeset = nl_langinfo(CODESET);
-		if (loc_codeset && *loc_codeset) {
+if (loc_codeset && *loc_codeset) {
-			PyObject *enc = PyCodec_Encoder(loc_codeset);
+PyObject *enc = PyCodec_Encoder(loc_codeset);
-			if (enc) {
+if (enc) {
-				loc_codeset = strdup(loc_codeset);
+loc_codeset = strdup(loc_codeset);
-				Py_DECREF(enc);
+Py_DECREF(enc);
-			} else {
+} else {
-				if (PyErr_ExceptionMatches(PyExc_LookupError)) {
+if (PyErr_ExceptionMatches(PyExc_LookupError)) {
-					PyErr_Clear();
+PyErr_Clear();
-					loc_codeset = NULL;
+loc_codeset = NULL;
-				} else {
+} else {
-					PyErr_Print();
+PyErr_Print();
-					exit(1);
+exit(1);
-				}
+}
-			}
+}
-		} else
+} else
-			loc_codeset = NULL;
+loc_codeset = NULL;
-		setlocale(LC_CTYPE, saved_locale);
+setlocale(LC_CTYPE, saved_locale);
-		free(saved_locale);
+free(saved_locale);
-		if (!overridden) {
+if (!overridden) {
-			codeset = icodeset = loc_codeset;
+codeset = icodeset = loc_codeset;
-			free_codeset = 1;
+free_codeset = 1;
-		}
+}
-		/* Initialize Py_FileSystemDefaultEncoding from
+/* Initialize Py_FileSystemDefaultEncoding from
-		   locale even if PYTHONIOENCODING is set. */
+locale even if PYTHONIOENCODING is set. */
-		if (!Py_FileSystemDefaultEncoding) {
+if (!Py_FileSystemDefaultEncoding) {
-			Py_FileSystemDefaultEncoding = loc_codeset;
+Py_FileSystemDefaultEncoding = loc_codeset;
-			if (!overridden)
+if (!overridden)
-				free_codeset = 0;
+free_codeset = 0;
-		}
+}
-	}
+}
 #endif
 #ifdef MS_WINDOWS
-	if (!overridden) {
+if (!overridden) {
-		icodeset = ibuf;
+icodeset = ibuf;
-		codeset = buf;
+codeset = buf;
-		sprintf(ibuf, "cp%d", GetConsoleCP());
+sprintf(ibuf, "cp%d", GetConsoleCP());
-		sprintf(buf, "cp%d", GetConsoleOutputCP());
+sprintf(buf, "cp%d", GetConsoleOutputCP());
-	}
+}
 #endif
-	if (codeset) {
+if (codeset) {
-		sys_stream = PySys_GetObject("stdin");
+sys_stream = PySys_GetObject("stdin");
-		sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
+sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
-		if (!sys_isatty)
+if (!sys_isatty)
-			PyErr_Clear();
+PyErr_Clear();
-		if ((overridden ||
+if ((overridden ||
-		     (sys_isatty && PyObject_IsTrue(sys_isatty))) &&
+(sys_isatty && PyObject_IsTrue(sys_isatty))) &&
-		   PyFile_Check(sys_stream)) {
+PyFile_Check(sys_stream)) {
-			if (!PyFile_SetEncodingAndErrors(sys_stream, icodeset, errors))
+if (!PyFile_SetEncodingAndErrors(sys_stream, icodeset, errors))
-				Py_FatalError("Cannot set codeset of stdin");
+Py_FatalError("Cannot set codeset of stdin");
-		}
+}
-		Py_XDECREF(sys_isatty);
+Py_XDECREF(sys_isatty);
-		sys_stream = PySys_GetObject("stdout");
+sys_stream = PySys_GetObject("stdout");
-		sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
+sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
-		if (!sys_isatty)
+if (!sys_isatty)
-			PyErr_Clear();
+PyErr_Clear();
-		if ((overridden ||
+if ((overridden ||
-		     (sys_isatty && PyObject_IsTrue(sys_isatty))) &&
+(sys_isatty && PyObject_IsTrue(sys_isatty))) &&
-		   PyFile_Check(sys_stream)) {
+PyFile_Check(sys_stream)) {
-			if (!PyFile_SetEncodingAndErrors(sys_stream, codeset, errors))
+if (!PyFile_SetEncodingAndErrors(sys_stream, codeset, errors))
-				Py_FatalError("Cannot set codeset of stdout");
+Py_FatalError("Cannot set codeset of stdout");
-		}
+}
-		Py_XDECREF(sys_isatty);
+Py_XDECREF(sys_isatty);
-		sys_stream = PySys_GetObject("stderr");
+sys_stream = PySys_GetObject("stderr");
-		sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
+sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
-		if (!sys_isatty)
+if (!sys_isatty)
-			PyErr_Clear();
+PyErr_Clear();
-		if((overridden ||
+if((overridden ||
-		    (sys_isatty && PyObject_IsTrue(sys_isatty))) &&
+(sys_isatty && PyObject_IsTrue(sys_isatty))) &&
-		   PyFile_Check(sys_stream)) {
+PyFile_Check(sys_stream)) {
-			if (!PyFile_SetEncodingAndErrors(sys_stream, codeset, errors))
+if (!PyFile_SetEncodingAndErrors(sys_stream, codeset, errors))
-				Py_FatalError("Cannot set codeset of stderr");
+Py_FatalError("Cannot set codeset of stderr");
-		}
+}
-		Py_XDECREF(sys_isatty);
+Py_XDECREF(sys_isatty);
-		if (free_codeset)
+if (free_codeset)
-			free(codeset);
+free(codeset);
-	}
+}
 }
 void
 Py_Initialize(void)
 {
-	Py_InitializeEx(1);
+Py_InitializeEx(1);
 }
 #ifdef COUNT_ALLOCS
 extern void dump_counts(FILE*);
 */
 void
 Py_Finalize(void)
 {
-	PyInterpreterState *interp;
+PyInterpreterState *interp;
-	PyThreadState *tstate;
+PyThreadState *tstate;
-	if (!initialized)
+if (!initialized)
-		return;
+return;
-	wait_for_thread_shutdown();
+wait_for_thread_shutdown();
-	/* The interpreter is still entirely intact at this point, and the
+/* The interpreter is still entirely intact at this point, and the
-	 * exit funcs may be relying on that.  In particular, if some thread
+* exit funcs may be relying on that.  In particular, if some thread
-	 * or exit func is still waiting to do an import, the import machinery
+* or exit func is still waiting to do an import, the import machinery
-	 * expects Py_IsInitialized() to return true.  So don't say the
+* expects Py_IsInitialized() to return true.  So don't say the
-	 * interpreter is uninitialized until after the exit funcs have run.
+* interpreter is uninitialized until after the exit funcs have run.
-	 * Note that Threading.py uses an exit func to do a join on all the
+* Note that Threading.py uses an exit func to do a join on all the
-	 * threads created thru it, so this also protects pending imports in
+* threads created thru it, so this also protects pending imports in
-	 * the threads created via Threading.
+* the threads created via Threading.
-	 */
+*/
-	call_sys_exitfunc();
+call_sys_exitfunc();
-	initialized = 0;
+initialized = 0;
-	/* Get current thread state and interpreter pointer */
+/* Get current thread state and interpreter pointer */
-	tstate = PyThreadState_GET();
+tstate = PyThreadState_GET();
-	interp = tstate->interp;
+interp = tstate->interp;
-	/* Disable signal handling */
+/* Disable signal handling */
-	PyOS_FiniInterrupts();
+PyOS_FiniInterrupts();
-	/* Clear type lookup cache */
+/* Clear type lookup cache */
-	PyType_ClearCache();
+PyType_ClearCache();
-	/* Collect garbage.  This may call finalizers; it's nice to call these
+/* Collect garbage.  This may call finalizers; it's nice to call these
-	 * before all modules are destroyed.
+* before all modules are destroyed.
-	 * XXX If a __del__ or weakref callback is triggered here, and tries to
+* XXX If a __del__ or weakref callback is triggered here, and tries to
-	 * XXX import a module, bad things can happen, because Python no
+* XXX import a module, bad things can happen, because Python no
-	 * XXX longer believes it's initialized.
+* XXX longer believes it's initialized.
-	 * XXX     Fatal Python error: Interpreter not initialized (version mismatch?)
+* XXX     Fatal Python error: Interpreter not initialized (version mismatch?)
-	 * XXX is easy to provoke that way.  I've also seen, e.g.,
+* XXX is easy to provoke that way.  I've also seen, e.g.,
-	 * XXX     Exception exceptions.ImportError: 'No module named sha'
+* XXX     Exception exceptions.ImportError: 'No module named sha'
-	 * XXX         in <function callback at 0x008F5718> ignored
+* XXX         in <function callback at 0x008F5718> ignored
-	 * XXX but I'm unclear on exactly how that one happens.  In any case,
+* XXX but I'm unclear on exactly how that one happens.  In any case,
-	 * XXX I haven't seen a real-life report of either of these.
+* XXX I haven't seen a real-life report of either of these.
-	 */
+*/
-	PyGC_Collect();
+PyGC_Collect();
 #ifdef COUNT_ALLOCS
-	/* With COUNT_ALLOCS, it helps to run GC multiple times:
+/* With COUNT_ALLOCS, it helps to run GC multiple times:
-	   each collection might release some types from the type
+each collection might release some types from the type
-	   list, so they become garbage. */
+list, so they become garbage. */
-	while (PyGC_Collect() > 0)
+while (PyGC_Collect() > 0)
-		/* nothing */;
+/* nothing */;
 #endif
-	/* Destroy all modules */
+/* Destroy all modules */
-	PyImport_Cleanup();
+PyImport_Cleanup();
-	/* Collect final garbage.  This disposes of cycles created by
+/* Collect final garbage.  This disposes of cycles created by
-	 * new-style class definitions, for example.
+* new-style class definitions, for example.
-	 * XXX This is disabled because it caused too many problems.  If
+* XXX This is disabled because it caused too many problems.  If
-	 * XXX a __del__ or weakref callback triggers here, Python code has
+* XXX a __del__ or weakref callback triggers here, Python code has
-	 * XXX a hard time running, because even the sys module has been
+* XXX a hard time running, because even the sys module has been
-	 * XXX cleared out (sys.stdout is gone, sys.excepthook is gone, etc).
+* XXX cleared out (sys.stdout is gone, sys.excepthook is gone, etc).
-	 * XXX One symptom is a sequence of information-free messages
+* XXX One symptom is a sequence of information-free messages
-	 * XXX coming from threads (if a __del__ or callback is invoked,
+* XXX coming from threads (if a __del__ or callback is invoked,
-	 * XXX other threads can execute too, and any exception they encounter
+* XXX other threads can execute too, and any exception they encounter
-	 * XXX triggers a comedy of errors as subsystem after subsystem
+* XXX triggers a comedy of errors as subsystem after subsystem
-	 * XXX fails to find what it *expects* to find in sys to help report
+* XXX fails to find what it *expects* to find in sys to help report
-	 * XXX the exception and consequent unexpected failures).  I've also
+* XXX the exception and consequent unexpected failures).  I've also
-	 * XXX seen segfaults then, after adding print statements to the
+* XXX seen segfaults then, after adding print statements to the
-	 * XXX Python code getting called.
+* XXX Python code getting called.
-	 */
+*/
 #if 0
-	PyGC_Collect();
+PyGC_Collect();
 #endif
-	/* Destroy the database used by _PyImport_{Fixup,Find}Extension */
+/* Destroy the database used by _PyImport_{Fixup,Find}Extension */
-	_PyImport_Fini();
+_PyImport_Fini();
-	/* Debugging stuff */
+/* Debugging stuff */
 #ifdef COUNT_ALLOCS
-	dump_counts(stdout);
+dump_counts(stdout);
 #endif
-	PRINT_TOTAL_REFS();
+PRINT_TOTAL_REFS();
 #ifdef Py_TRACE_REFS
-	/* Display all objects still alive -- this can invoke arbitrary
+/* Display all objects still alive -- this can invoke arbitrary
-	 * __repr__ overrides, so requires a mostly-intact interpreter.
+* __repr__ overrides, so requires a mostly-intact interpreter.
-	 * Alas, a lot of stuff may still be alive now that will be cleaned
+* Alas, a lot of stuff may still be alive now that will be cleaned
-	 * up later.
+* up later.
-	 */
+*/
-	if (Py_GETENV("PYTHONDUMPREFS"))
+if (Py_GETENV("PYTHONDUMPREFS"))
-		_Py_PrintReferences(stderr);
+_Py_PrintReferences(stderr);
 #endif /* Py_TRACE_REFS */
-	/* Clear interpreter state */
+/* Clear interpreter state */
-	PyInterpreterState_Clear(interp);
+PyInterpreterState_Clear(interp);
-	/* Now we decref the exception classes.  After this point nothing
+/* Now we decref the exception classes.  After this point nothing
-	   can raise an exception.  That's okay, because each Fini() method
+can raise an exception.  That's okay, because each Fini() method
-	   below has been checked to make sure no exceptions are ever
+below has been checked to make sure no exceptions are ever
-	   raised.
+raised.
-	*/
+*/
-	_PyExc_Fini();
+_PyExc_Fini();
-	/* Cleanup auto-thread-state */
+/* Cleanup auto-thread-state */
 #ifdef WITH_THREAD
-	_PyGILState_Fini();
+_PyGILState_Fini();
 #endif /* WITH_THREAD */
-	/* Delete current thread */
+/* Delete current thread */
-	PyThreadState_Swap(NULL);
+PyThreadState_Swap(NULL);
-	PyInterpreterState_Delete(interp);
+PyInterpreterState_Delete(interp);
-	/* Sundry finalizers */
+/* Sundry finalizers */
-	PyMethod_Fini();
+PyMethod_Fini();
-	PyFrame_Fini();
+PyFrame_Fini();
-	PyCFunction_Fini();
+PyCFunction_Fini();
-	PyTuple_Fini();
+PyTuple_Fini();
-	PyList_Fini();
+PyList_Fini();
-	PySet_Fini();
+PySet_Fini();
-	PyString_Fini();
+PyString_Fini();
-	PyByteArray_Fini();
+PyByteArray_Fini();
-	PyInt_Fini();
+PyInt_Fini();
-	PyFloat_Fini();
+PyFloat_Fini();
-	PyDict_Fini();
+PyDict_Fini();
 #ifdef Py_USING_UNICODE
-	/* Cleanup Unicode implementation */
+/* Cleanup Unicode implementation */
-	_PyUnicode_Fini();
+_PyUnicode_Fini();
 #endif
-	/* XXX Still allocated:
+/* XXX Still allocated:
-	   - various static ad-hoc pointers to interned strings
+- various static ad-hoc pointers to interned strings
-	   - int and float free list blocks
+- int and float free list blocks
-	   - whatever various modules and libraries allocate
+- whatever various modules and libraries allocate
-	*/
+*/
-	PyGrammar_RemoveAccelerators(&_PyParser_Grammar);
+PyGrammar_RemoveAccelerators(&_PyParser_Grammar);
 #ifdef Py_TRACE_REFS
-	/* Display addresses (& refcnts) of all objects still alive.
+/* Display addresses (& refcnts) of all objects still alive.
-	 * An address can be used to find the repr of the object, printed
+* An address can be used to find the repr of the object, printed
-	 * above by _Py_PrintReferences.
+* above by _Py_PrintReferences.
-	 */
+*/
-	if (Py_GETENV("PYTHONDUMPREFS"))
+if (Py_GETENV("PYTHONDUMPREFS"))
-		_Py_PrintReferenceAddresses(stderr);
+_Py_PrintReferenceAddresses(stderr);
 #endif /* Py_TRACE_REFS */
 #ifdef PYMALLOC_DEBUG
-	if (Py_GETENV("PYTHONMALLOCSTATS"))
+if (Py_GETENV("PYTHONMALLOCSTATS"))
-		_PyObject_DebugMallocStats();
+_PyObject_DebugMallocStats();
 #endif
-	call_ll_exitfuncs();
+call_ll_exitfuncs();
 }
 /* Create and initialize a new interpreter and thread, and return the
 new thread.  This requires that Py_Initialize() has been called
 first.
 */
 PyThreadState *
 Py_NewInterpreter(void)
 {
-	PyInterpreterState *interp;
+PyInterpreterState *interp;
-	PyThreadState *tstate, *save_tstate;
+PyThreadState *tstate, *save_tstate;
-	PyObject *bimod, *sysmod;
+PyObject *bimod, *sysmod;
-	if (!initialized)
+if (!initialized)
-		Py_FatalError("Py_NewInterpreter: call Py_Initialize first");
+Py_FatalError("Py_NewInterpreter: call Py_Initialize first");
-	interp = PyInterpreterState_New();
+interp = PyInterpreterState_New();
-	if (interp == NULL)
+if (interp == NULL)
-		return NULL;
+return NULL;
-	tstate = PyThreadState_New(interp);
+tstate = PyThreadState_New(interp);
-	if (tstate == NULL) {
+if (tstate == NULL) {
-		PyInterpreterState_Delete(interp);
+PyInterpreterState_Delete(interp);
-		return NULL;
+return NULL;
-	}
+}
-	save_tstate = PyThreadState_Swap(tstate);
+save_tstate = PyThreadState_Swap(tstate);
-	/* XXX The following is lax in error checking */
+/* XXX The following is lax in error checking */
-	interp->modules = PyDict_New();
+interp->modules = PyDict_New();
-	interp->modules_reloading = PyDict_New();
+interp->modules_reloading = PyDict_New();
-	bimod = _PyImport_FindExtension("__builtin__", "__builtin__");
+bimod = _PyImport_FindExtension("__builtin__", "__builtin__");
-	if (bimod != NULL) {
+if (bimod != NULL) {
-		interp->builtins = PyModule_GetDict(bimod);
+interp->builtins = PyModule_GetDict(bimod);
-		if (interp->builtins == NULL)
+if (interp->builtins == NULL)
-			goto handle_error;
+goto handle_error;
-		Py_INCREF(interp->builtins);
+Py_INCREF(interp->builtins);
-	}
+}
-	sysmod = _PyImport_FindExtension("sys", "sys");
+sysmod = _PyImport_FindExtension("sys", "sys");
-	if (bimod != NULL && sysmod != NULL) {
+if (bimod != NULL && sysmod != NULL) {
-		interp->sysdict = PyModule_GetDict(sysmod);
+interp->sysdict = PyModule_GetDict(sysmod);
-		if (interp->sysdict == NULL)
+if (interp->sysdict == NULL)
-			goto handle_error;
+goto handle_error;
-		Py_INCREF(interp->sysdict);
+Py_INCREF(interp->sysdict);
-		PySys_SetPath(Py_GetPath());
+PySys_SetPath(Py_GetPath());
-		PyDict_SetItemString(interp->sysdict, "modules",
+PyDict_SetItemString(interp->sysdict, "modules",
-				     interp->modules);
+interp->modules);
-		_PyImportHooks_Init();
+_PyImportHooks_Init();
-		initmain();
+initmain();
-		if (!Py_NoSiteFlag)
+if (!Py_NoSiteFlag)
-			initsite();
+initsite();
-	}
+}
-	if (!PyErr_Occurred())
+if (!PyErr_Occurred())
-		return tstate;
+return tstate;
 handle_error:
-	/* Oops, it didn't work.  Undo it all. */
+/* Oops, it didn't work.  Undo it all. */
-	PyErr_Print();
+PyErr_Print();
-	PyThreadState_Clear(tstate);
+PyThreadState_Clear(tstate);
-	PyThreadState_Swap(save_tstate);
+PyThreadState_Swap(save_tstate);
-	PyThreadState_Delete(tstate);
+PyThreadState_Delete(tstate);
-	PyInterpreterState_Delete(interp);
+PyInterpreterState_Delete(interp);
-	return NULL;
+return NULL;
 }
 /* Delete an interpreter and its last thread.  This requires that the
 given thread state is current, that the thread has no remaining
 frames, and that it is its interpreter's only remaining thread.
 */
 void
 Py_EndInterpreter(PyThreadState *tstate)
 {
-	PyInterpreterState *interp = tstate->interp;
+PyInterpreterState *interp = tstate->interp;
-	if (tstate != PyThreadState_GET())
+if (tstate != PyThreadState_GET())
-		Py_FatalError("Py_EndInterpreter: thread is not current");
+Py_FatalError("Py_EndInterpreter: thread is not current");
-	if (tstate->frame != NULL)
+if (tstate->frame != NULL)
-		Py_FatalError("Py_EndInterpreter: thread still has a frame");
+Py_FatalError("Py_EndInterpreter: thread still has a frame");
-	if (tstate != interp->tstate_head || tstate->next != NULL)
+if (tstate != interp->tstate_head || tstate->next != NULL)
-		Py_FatalError("Py_EndInterpreter: not the last thread");
+Py_FatalError("Py_EndInterpreter: not the last thread");
-	PyImport_Cleanup();
+PyImport_Cleanup();
-	PyInterpreterState_Clear(interp);
+PyInterpreterState_Clear(interp);
-	PyThreadState_Swap(NULL);
+PyThreadState_Swap(NULL);
-	PyInterpreterState_Delete(interp);
+PyInterpreterState_Delete(interp);
 }
 static char *progname = "python";
 void
 Py_SetProgramName(char *pn)
 {
-	if (pn && *pn)
+if (pn && *pn)
-		progname = pn;
+progname = pn;
 }
 char *
 Py_GetProgramName(void)
 {
-	return progname;
+return progname;
 }
 static char *default_home = NULL;
 void
 Py_SetPythonHome(char *home)
 {
-	default_home = home;
+default_home = home;
 }
 char *
 Py_GetPythonHome(void)
 {
-	char *home = default_home;
+char *home = default_home;
-	if (home == NULL && !Py_IgnoreEnvironmentFlag)
+if (home == NULL && !Py_IgnoreEnvironmentFlag)
-		home = Py_GETENV("PYTHONHOME");
+home = Py_GETENV("PYTHONHOME");
-	return home;
+return home;
 }
 /* Create __main__ module */
 static void
 initmain(void)
 {
-	PyObject *m, *d;
+PyObject *m, *d;
-	m = PyImport_AddModule("__main__");
+m = PyImport_AddModule("__main__");
-	if (m == NULL)
+if (m == NULL)
-		Py_FatalError("can't create __main__ module");
+Py_FatalError("can't create __main__ module");
-	d = PyModule_GetDict(m);
+d = PyModule_GetDict(m);
-	if (PyDict_GetItemString(d, "__builtins__") == NULL) {
+if (PyDict_GetItemString(d, "__builtins__") == NULL) {
-		PyObject *bimod = PyImport_ImportModule("__builtin__");
+PyObject *bimod = PyImport_ImportModule("__builtin__");
-		if (bimod == NULL ||
+if (bimod == NULL ||
-		    PyDict_SetItemString(d, "__builtins__", bimod) != 0)
+PyDict_SetItemString(d, "__builtins__", bimod) != 0)
-			Py_FatalError("can't add __builtins__ to __main__");
+Py_FatalError("can't add __builtins__ to __main__");
-		Py_XDECREF(bimod);
+Py_XDECREF(bimod);
-	}
+}
 }
 /* Import the site module (not into __main__ though) */
 static void
 initsite(void)
 {
-	PyObject *m;
+PyObject *m;
-	m = PyImport_ImportModule("site");
+m = PyImport_ImportModule("site");
-	if (m == NULL) {
+if (m == NULL) {
-		PyErr_Print();
+PyErr_Print();
-		Py_Finalize();
+Py_Finalize();
-		exit(1);
+exit(1);
-	}
+}
-	else {
+else {
-		Py_DECREF(m);
+Py_DECREF(m);
-	}
+}
 }
 /* Parse input from a file and execute it */
 int
 PyRun_AnyFileExFlags(FILE *fp, const char *filename, int closeit,
-		     PyCompilerFlags *flags)
+PyCompilerFlags *flags)
 {
-	if (filename == NULL)
+if (filename == NULL)
-		filename = "???";
+filename = "???";
-	if (Py_FdIsInteractive(fp, filename)) {
+if (Py_FdIsInteractive(fp, filename)) {
-		int err = PyRun_InteractiveLoopFlags(fp, filename, flags);
+int err = PyRun_InteractiveLoopFlags(fp, filename, flags);
-		if (closeit)
+if (closeit)
-			fclose(fp);
+fclose(fp);
-		return err;
+return err;
-	}
+}
-	else
+else
-		return PyRun_SimpleFileExFlags(fp, filename, closeit, flags);
+return PyRun_SimpleFileExFlags(fp, filename, closeit, flags);
 }
 int
 PyRun_InteractiveLoopFlags(FILE *fp, const char *filename, PyCompilerFlags *flags)
 {
-	PyObject *v;
+PyObject *v;
-	int ret;
+int ret;
-	PyCompilerFlags local_flags;
+PyCompilerFlags local_flags;
-	if (flags == NULL) {
+if (flags == NULL) {
-		flags = &local_flags;
+flags = &local_flags;
-		local_flags.cf_flags = 0;
+local_flags.cf_flags = 0;
-	}
+}
-	v = PySys_GetObject("ps1");
+v = PySys_GetObject("ps1");
-	if (v == NULL) {
+if (v == NULL) {
-		PySys_SetObject("ps1", v = PyString_FromString(">>> "));
+PySys_SetObject("ps1", v = PyString_FromString(">>> "));
-		Py_XDECREF(v);
+Py_XDECREF(v);
-	}
+}
-	v = PySys_GetObject("ps2");
+v = PySys_GetObject("ps2");
-	if (v == NULL) {
+if (v == NULL) {
-		PySys_SetObject("ps2", v = PyString_FromString("... "));
+PySys_SetObject("ps2", v = PyString_FromString("... "));
-		Py_XDECREF(v);
+Py_XDECREF(v);
-	}
+}
-	for (;;) {
+for (;;) {
-		ret = PyRun_InteractiveOneFlags(fp, filename, flags);
+ret = PyRun_InteractiveOneFlags(fp, filename, flags);
-		PRINT_TOTAL_REFS();
+PRINT_TOTAL_REFS();
-		if (ret == E_EOF)
+if (ret == E_EOF)
-			return 0;
+return 0;
-		/*
+/*
-		if (ret == E_NOMEM)
+if (ret == E_NOMEM)
-			return -1;
+return -1;
-		*/
+*/
-	}
+}
 }
 #if 0
 /* compute parser flags based on compiler flags */
 #define PARSER_FLAGS(flags) \
-	((flags) ? ((((flags)->cf_flags & PyCF_DONT_IMPLY_DEDENT) ? \
+((flags) ? ((((flags)->cf_flags & PyCF_DONT_IMPLY_DEDENT) ? \
-		      PyPARSE_DONT_IMPLY_DEDENT : 0)) : 0)
+PyPARSE_DONT_IMPLY_DEDENT : 0)) : 0)
 #endif
 #if 1
 /* Keep an example of flags with future keyword support. */
 #define PARSER_FLAGS(flags) \
-	((flags) ? ((((flags)->cf_flags & PyCF_DONT_IMPLY_DEDENT) ? \
+((flags) ? ((((flags)->cf_flags & PyCF_DONT_IMPLY_DEDENT) ? \
-		      PyPARSE_DONT_IMPLY_DEDENT : 0) \
+PyPARSE_DONT_IMPLY_DEDENT : 0) \
-		    | (((flags)->cf_flags & CO_FUTURE_PRINT_FUNCTION) ? \
+| (((flags)->cf_flags & CO_FUTURE_PRINT_FUNCTION) ? \
-		       PyPARSE_PRINT_IS_FUNCTION : 0) \
+PyPARSE_PRINT_IS_FUNCTION : 0) \
-		    | (((flags)->cf_flags & CO_FUTURE_UNICODE_LITERALS) ? \
+| (((flags)->cf_flags & CO_FUTURE_UNICODE_LITERALS) ? \
-		       PyPARSE_UNICODE_LITERALS : 0) \
+PyPARSE_UNICODE_LITERALS : 0) \
-		    ) : 0)
+) : 0)
 #endif
 int
 PyRun_InteractiveOneFlags(FILE *fp, const char *filename, PyCompilerFlags *flags)
 {
-	PyObject *m, *d, *v, *w;
+PyObject *m, *d, *v, *w;
-	mod_ty mod;
+mod_ty mod;
-	PyArena *arena;
+PyArena *arena;
-	char *ps1 = "", *ps2 = "";
+char *ps1 = "", *ps2 = "";
-	int errcode = 0;
+int errcode = 0;
-	v = PySys_GetObject("ps1");
+v = PySys_GetObject("ps1");
-	if (v != NULL) {
+if (v != NULL) {
-		v = PyObject_Str(v);
+v = PyObject_Str(v);
-		if (v == NULL)
+if (v == NULL)
-			PyErr_Clear();
+PyErr_Clear();
-		else if (PyString_Check(v))
+else if (PyString_Check(v))
-			ps1 = PyString_AsString(v);
+ps1 = PyString_AsString(v);
-	}
+}
-	w = PySys_GetObject("ps2");
+w = PySys_GetObject("ps2");
-	if (w != NULL) {
+if (w != NULL) {
-		w = PyObject_Str(w);
+w = PyObject_Str(w);
-		if (w == NULL)
+if (w == NULL)
-			PyErr_Clear();
+PyErr_Clear();
-		else if (PyString_Check(w))
+else if (PyString_Check(w))
-			ps2 = PyString_AsString(w);
+ps2 = PyString_AsString(w);
-	}
+}
-	arena = PyArena_New();
+arena = PyArena_New();
-	if (arena == NULL) {
+if (arena == NULL) {
-		Py_XDECREF(v);
+Py_XDECREF(v);
-		Py_XDECREF(w);
+Py_XDECREF(w);
-		return -1;
+return -1;
-	}
+}
-	mod = PyParser_ASTFromFile(fp, filename,
+mod = PyParser_ASTFromFile(fp, filename,
-				   Py_single_input, ps1, ps2,
+Py_single_input, ps1, ps2,
-				   flags, &errcode, arena);
+flags, &errcode, arena);
-	Py_XDECREF(v);
+Py_XDECREF(v);
-	Py_XDECREF(w);
+Py_XDECREF(w);
-	if (mod == NULL) {
+if (mod == NULL) {
-		PyArena_Free(arena);
+PyArena_Free(arena);
-		if (errcode == E_EOF) {
+if (errcode == E_EOF) {
-			PyErr_Clear();
+PyErr_Clear();
-			return E_EOF;
+return E_EOF;
-		}
+}
-		PyErr_Print();
+PyErr_Print();
-		return -1;
+return -1;
-	}
+}
-	m = PyImport_AddModule("__main__");
+m = PyImport_AddModule("__main__");
-	if (m == NULL) {
+if (m == NULL) {
-		PyArena_Free(arena);
+PyArena_Free(arena);
-		return -1;
+return -1;
-	}
+}
-	d = PyModule_GetDict(m);
+d = PyModule_GetDict(m);
-	v = run_mod(mod, filename, d, d, flags, arena);
+v = run_mod(mod, filename, d, d, flags, arena);
-	PyArena_Free(arena);
+PyArena_Free(arena);
-	if (v == NULL) {
+if (v == NULL) {
-		PyErr_Print();
+PyErr_Print();
-		return -1;
+return -1;
-	}
+}
-	Py_DECREF(v);
+Py_DECREF(v);
-	if (Py_FlushLine())
+if (Py_FlushLine())
-		PyErr_Clear();
+PyErr_Clear();
-	return 0;
+return 0;
 }
 /* Check whether a file maybe a pyc file: Look at the extension,
 the file type, and, if we may close it, at the first few bytes. */
 static int
 maybe_pyc_file(FILE *fp, const char* filename, const char* ext, int closeit)
 {
-	if (strcmp(ext, ".pyc") == 0 || strcmp(ext, ".pyo") == 0)
+if (strcmp(ext, ".pyc") == 0 || strcmp(ext, ".pyo") == 0)
-		return 1;
+return 1;
-	/* Only look into the file if we are allowed to close it, since
+/* Only look into the file if we are allowed to close it, since
-	   it then should also be seekable. */
+it then should also be seekable. */
-	if (closeit) {
+if (closeit) {
-		/* Read only two bytes of the magic. If the file was opened in
+/* Read only two bytes of the magic. If the file was opened in
-		   text mode, the bytes 3 and 4 of the magic (\r\n) might not
+text mode, the bytes 3 and 4 of the magic (\r\n) might not
-		   be read as they are on disk. */
+be read as they are on disk. */
-		unsigned int halfmagic = PyImport_GetMagicNumber() & 0xFFFF;
+unsigned int halfmagic = PyImport_GetMagicNumber() & 0xFFFF;
-		unsigned char buf[2];
+unsigned char buf[2];
-		/* Mess:  In case of -x, the stream is NOT at its start now,
+/* Mess:  In case of -x, the stream is NOT at its start now,
-		   and ungetc() was used to push back the first newline,
+and ungetc() was used to push back the first newline,
-		   which makes the current stream position formally undefined,
+which makes the current stream position formally undefined,
-		   and a x-platform nightmare.
+and a x-platform nightmare.
-		   Unfortunately, we have no direct way to know whether -x
+Unfortunately, we have no direct way to know whether -x
-		   was specified.  So we use a terrible hack:  if the current
+was specified.  So we use a terrible hack:  if the current
-		   stream position is not 0, we assume -x was specified, and
+stream position is not 0, we assume -x was specified, and
-		   give up.  Bug 132850 on SourceForge spells out the
+give up.  Bug 132850 on SourceForge spells out the
-		   hopelessness of trying anything else (fseek and ftell
+hopelessness of trying anything else (fseek and ftell
-		   don't work predictably x-platform for text-mode files).
+don't work predictably x-platform for text-mode files).
-		*/
+*/
-		int ispyc = 0;
+int ispyc = 0;
-		if (ftell(fp) == 0) {
+if (ftell(fp) == 0) {
-			if (fread(buf, 1, 2, fp) == 2 &&
+if (fread(buf, 1, 2, fp) == 2 &&
-			    ((unsigned int)buf[1]<<8 | buf[0]) == halfmagic)
+((unsigned int)buf[1]<<8 | buf[0]) == halfmagic)
-				ispyc = 1;
+ispyc = 1;
-			rewind(fp);
+rewind(fp);
-		}
+}
-		return ispyc;
+return ispyc;
-	}
+}
-	return 0;
+return 0;
 }
 int
 PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
-			PyCompilerFlags *flags)
+PyCompilerFlags *flags)
 {
-	PyObject *m, *d, *v;
+PyObject *m, *d, *v;
-	const char *ext;
+const char *ext;
-	int set_file_name = 0, ret, len;
+int set_file_name = 0, ret, len;
-	m = PyImport_AddModule("__main__");
+m = PyImport_AddModule("__main__");
-	if (m == NULL)
+if (m == NULL)
-		return -1;
+return -1;
-	d = PyModule_GetDict(m);
+d = PyModule_GetDict(m);
-	if (PyDict_GetItemString(d, "__file__") == NULL) {
+if (PyDict_GetItemString(d, "__file__") == NULL) {
-		PyObject *f = PyString_FromString(filename);
+PyObject *f = PyString_FromString(filename);
-		if (f == NULL)
+if (f == NULL)
-			return -1;
+return -1;
-		if (PyDict_SetItemString(d, "__file__", f) < 0) {
+if (PyDict_SetItemString(d, "__file__", f) < 0) {
-			Py_DECREF(f);
+Py_DECREF(f);
-			return -1;
+return -1;
-		}
+}
-		set_file_name = 1;
+set_file_name = 1;
-		Py_DECREF(f);
+Py_DECREF(f);
-	}
+}
-	len = strlen(filename);
+len = strlen(filename);
-	ext = filename + len - (len > 4 ? 4 : 0);
+ext = filename + len - (len > 4 ? 4 : 0);
-	if (maybe_pyc_file(fp, filename, ext, closeit)) {
+if (maybe_pyc_file(fp, filename, ext, closeit)) {
-		/* Try to run a pyc file. First, re-open in binary */
+/* Try to run a pyc file. First, re-open in binary */
-		if (closeit)
+if (closeit)
-			fclose(fp);
+fclose(fp);
-		if ((fp = fopen(filename, "rb")) == NULL) {
+if ((fp = fopen(filename, "rb")) == NULL) {
-			fprintf(stderr, "python: Can't reopen .pyc file\n");
+fprintf(stderr, "python: Can't reopen .pyc file\n");
-			ret = -1;
+ret = -1;
-			goto done;
+goto done;
-		}
+}
-		/* Turn on optimization if a .pyo file is given */
+/* Turn on optimization if a .pyo file is given */
-		if (strcmp(ext, ".pyo") == 0)
+if (strcmp(ext, ".pyo") == 0)
-			Py_OptimizeFlag = 1;
+Py_OptimizeFlag = 1;
-		v = run_pyc_file(fp, filename, d, d, flags);
+v = run_pyc_file(fp, filename, d, d, flags);
-	} else {
+} else {
-		v = PyRun_FileExFlags(fp, filename, Py_file_input, d, d,
+v = PyRun_FileExFlags(fp, filename, Py_file_input, d, d,
-				      closeit, flags);
+closeit, flags);
-	}
+}
-	if (v == NULL) {
+if (v == NULL) {
-		PyErr_Print();
+PyErr_Print();
-		ret = -1;
+ret = -1;
-		goto done;
+goto done;
-	}
+}
-	Py_DECREF(v);
+Py_DECREF(v);
-	if (Py_FlushLine())
+if (Py_FlushLine())
-		PyErr_Clear();
+PyErr_Clear();
-	ret = 0;
+ret = 0;
 done:
-	if (set_file_name && PyDict_DelItemString(d, "__file__"))
+if (set_file_name && PyDict_DelItemString(d, "__file__"))
-		PyErr_Clear();
+PyErr_Clear();
-	return ret;
+return ret;
 }
 int
 PyRun_SimpleStringFlags(const char *command, PyCompilerFlags *flags)
 {
-	PyObject *m, *d, *v;
+PyObject *m, *d, *v;
-	m = PyImport_AddModule("__main__");
+m = PyImport_AddModule("__main__");
-	if (m == NULL)
+if (m == NULL)
-		return -1;
+return -1;
-	d = PyModule_GetDict(m);
+d = PyModule_GetDict(m);
-	v = PyRun_StringFlags(command, Py_file_input, d, d, flags);
+v = PyRun_StringFlags(command, Py_file_input, d, d, flags);
-	if (v == NULL) {
+if (v == NULL) {
-		PyErr_Print();
+PyErr_Print();
-		return -1;
+return -1;
-	}
+}
-	Py_DECREF(v);
+Py_DECREF(v);
-	if (Py_FlushLine())
+if (Py_FlushLine())
-		PyErr_Clear();
+PyErr_Clear();
-	return 0;
+return 0;
 }
 static int
 parse_syntax_error(PyObject *err, PyObject **message, const char **filename,
-		   int *lineno, int *offset, const char **text)
+int *lineno, int *offset, const char **text)
 {
-	long hold;
+long hold;
-	PyObject *v;
+PyObject *v;
-	/* old style errors */
+/* old style errors */
-	if (PyTuple_Check(err))
+if (PyTuple_Check(err))
-		return PyArg_ParseTuple(err, "O(ziiz)", message, filename,
+return PyArg_ParseTuple(err, "O(ziiz)", message, filename,
-					lineno, offset, text);
+lineno, offset, text);
-	/* new style errors.  `err' is an instance */
+/* new style errors.  `err' is an instance */
-	if (! (v = PyObject_GetAttrString(err, "msg")))
+if (! (v = PyObject_GetAttrString(err, "msg")))
-		goto finally;
+goto finally;
-	*message = v;
+*message = v;
-	if (!(v = PyObject_GetAttrString(err, "filename")))
+if (!(v = PyObject_GetAttrString(err, "filename")))
-		goto finally;
+goto finally;
-	if (v == Py_None)
+if (v == Py_None)
-		*filename = NULL;
+*filename = NULL;
-	else if (! (*filename = PyString_AsString(v)))
+else if (! (*filename = PyString_AsString(v)))
-		goto finally;
+goto finally;
-	Py_DECREF(v);
+Py_DECREF(v);
-	if (!(v = PyObject_GetAttrString(err, "lineno")))
+if (!(v = PyObject_GetAttrString(err, "lineno")))
-		goto finally;
+goto finally;
-	hold = PyInt_AsLong(v);
+hold = PyInt_AsLong(v);
-	Py_DECREF(v);
+Py_DECREF(v);
-	v = NULL;
+v = NULL;
-	if (hold < 0 && PyErr_Occurred())
+if (hold < 0 && PyErr_Occurred())
-		goto finally;
+goto finally;
-	*lineno = (int)hold;
+*lineno = (int)hold;
-	if (!(v = PyObject_GetAttrString(err, "offset")))
+if (!(v = PyObject_GetAttrString(err, "offset")))
-		goto finally;
+goto finally;
-	if (v == Py_None) {
+if (v == Py_None) {
-		*offset = -1;
+*offset = -1;
-		Py_DECREF(v);
+Py_DECREF(v);
-		v = NULL;
+v = NULL;
-	} else {
+} else {
-		hold = PyInt_AsLong(v);
+hold = PyInt_AsLong(v);
-		Py_DECREF(v);
+Py_DECREF(v);
-		v = NULL;
+v = NULL;
-		if (hold < 0 && PyErr_Occurred())
+if (hold < 0 && PyErr_Occurred())
-			goto finally;
+goto finally;
-		*offset = (int)hold;
+*offset = (int)hold;
-	}
+}
-	if (!(v = PyObject_GetAttrString(err, "text")))
+if (!(v = PyObject_GetAttrString(err, "text")))
-		goto finally;
+goto finally;
-	if (v == Py_None)
+if (v == Py_None)
-		*text = NULL;
+*text = NULL;
-	else if (! (*text = PyString_AsString(v)))
+else if (! (*text = PyString_AsString(v)))
-		goto finally;
+goto finally;
-	Py_DECREF(v);
+Py_DECREF(v);
-	return 1;
+return 1;
 finally:
-	Py_XDECREF(v);
+Py_XDECREF(v);
-	return 0;
+return 0;
 }
 void
 PyErr_Print(void)
 {
-	PyErr_PrintEx(1);
+PyErr_PrintEx(1);
 }
 static void
 print_error_text(PyObject *f, int offset, const char *text)
 {
-	char *nl;
+char *nl;
-	if (offset >= 0) {
+if (offset >= 0) {
-		if (offset > 0 && offset == (int)strlen(text))
+if (offset > 0 && offset == (int)strlen(text))
-			offset--;
+offset--;
-		for (;;) {
+for (;;) {
-			nl = strchr(text, '\n');
+nl = strchr(text, '\n');
-			if (nl == NULL || nl-text >= offset)
+if (nl == NULL || nl-text >= offset)
-				break;
+break;
-			offset -= (int)(nl+1-text);
+offset -= (int)(nl+1-text);
-			text = nl+1;
+text = nl+1;
-		}
+}
-		while (*text == ' ' || *text == '\t') {
+while (*text == ' ' || *text == '\t') {
-			text++;
+text++;
-			offset--;
+offset--;
-		}
+}
-	}
+}
-	PyFile_WriteString("    ", f);
+PyFile_WriteString("    ", f);
-	PyFile_WriteString(text, f);
+PyFile_WriteString(text, f);
-	if (*text == '\0' || text[strlen(text)-1] != '\n')
+if (*text == '\0' || text[strlen(text)-1] != '\n')
-		PyFile_WriteString("\n", f);
+PyFile_WriteString("\n", f);
-	if (offset == -1)
+if (offset == -1)
-		return;
+return;
-	PyFile_WriteString("    ", f);
+PyFile_WriteString("    ", f);
-	offset--;
+offset--;
-	while (offset > 0) {
+while (offset > 0) {
-		PyFile_WriteString(" ", f);
+PyFile_WriteString(" ", f);
-		offset--;
+offset--;
-	}
+}
-	PyFile_WriteString("^\n", f);
+PyFile_WriteString("^\n", f);
 }
 static void
 handle_system_exit(void)
 {
-	PyObject *exception, *value, *tb;
+PyObject *exception, *value, *tb;
-	int exitcode = 0;
+int exitcode = 0;
-	if (Py_InspectFlag)
+if (Py_InspectFlag)
-		/* Don't exit if -i flag was given. This flag is set to 0
+/* Don't exit if -i flag was given. This flag is set to 0
-		 * when entering interactive mode for inspecting. */
+* when entering interactive mode for inspecting. */
-		return;
+return;
-	PyErr_Fetch(&exception, &value, &tb);
+PyErr_Fetch(&exception, &value, &tb);
-	if (Py_FlushLine())
+if (Py_FlushLine())
-		PyErr_Clear();
+PyErr_Clear();
-	fflush(stdout);
+fflush(stdout);
-	if (value == NULL || value == Py_None)
+if (value == NULL || value == Py_None)
-		goto done;
+goto done;
-	if (PyExceptionInstance_Check(value)) {
+if (PyExceptionInstance_Check(value)) {
-		/* The error code should be in the `code' attribute. */
+/* The error code should be in the `code' attribute. */
-		PyObject *code = PyObject_GetAttrString(value, "code");
+PyObject *code = PyObject_GetAttrString(value, "code");
-		if (code) {
+if (code) {
-			Py_DECREF(value);
+Py_DECREF(value);
-			value = code;
+value = code;
-			if (value == Py_None)
+if (value == Py_None)
-				goto done;
+goto done;
-		}
+}
-		/* If we failed to dig out the 'code' attribute,
+/* If we failed to dig out the 'code' attribute,
-		   just let the else clause below print the error. */
+just let the else clause below print the error. */
-	}
+}
-	if (PyInt_Check(value))
+if (PyInt_Check(value))
-		exitcode = (int)PyInt_AsLong(value);
+exitcode = (int)PyInt_AsLong(value);
-	else {
+else {
-		PyObject_Print(value, stderr, Py_PRINT_RAW);
+PyObject_Print(value, stderr, Py_PRINT_RAW);
-		PySys_WriteStderr("\n");
+PySys_WriteStderr("\n");
-		exitcode = 1;
+exitcode = 1;
-	}
+}
 done:
-	/* Restore and clear the exception info, in order to properly decref
+/* Restore and clear the exception info, in order to properly decref
-	 * the exception, value, and traceback.	 If we just exit instead,
+* the exception, value, and traceback.      If we just exit instead,
-	 * these leak, which confuses PYTHONDUMPREFS output, and may prevent
+* these leak, which confuses PYTHONDUMPREFS output, and may prevent
-	 * some finalizers from running.
+* some finalizers from running.
-	 */
+*/
-	PyErr_Restore(exception, value, tb);
+PyErr_Restore(exception, value, tb);
-	PyErr_Clear();
+PyErr_Clear();
-	Py_Exit(exitcode);
+Py_Exit(exitcode);
-	/* NOTREACHED */
+/* NOTREACHED */
 }
 void
 PyErr_PrintEx(int set_sys_last_vars)
 {
-	PyObject *exception, *v, *tb, *hook;
+PyObject *exception, *v, *tb, *hook;
-	if (PyErr_ExceptionMatches(PyExc_SystemExit)) {
+if (PyErr_ExceptionMatches(PyExc_SystemExit)) {
-		handle_system_exit();
+handle_system_exit();
-	}
+}
-	PyErr_Fetch(&exception, &v, &tb);
+PyErr_Fetch(&exception, &v, &tb);
-	if (exception == NULL)
+if (exception == NULL)
-		return;
+return;
-	PyErr_NormalizeException(&exception, &v, &tb);
+PyErr_NormalizeException(&exception, &v, &tb);
-	if (exception == NULL)
+if (exception == NULL)
-		return;
+return;
-	/* Now we know v != NULL too */
+/* Now we know v != NULL too */
-	if (set_sys_last_vars) {
+if (set_sys_last_vars) {
-		PySys_SetObject("last_type", exception);
+PySys_SetObject("last_type", exception);
-		PySys_SetObject("last_value", v);
+PySys_SetObject("last_value", v);
-		PySys_SetObject("last_traceback", tb);
+PySys_SetObject("last_traceback", tb);
-	}
+}
-	hook = PySys_GetObject("excepthook");
+hook = PySys_GetObject("excepthook");
-	if (hook) {
+if (hook) {
-		PyObject *args = PyTuple_Pack(3,
+PyObject *args = PyTuple_Pack(3,
-		    exception, v, tb ? tb : Py_None);
+exception, v, tb ? tb : Py_None);
-		PyObject *result = PyEval_CallObject(hook, args);
+PyObject *result = PyEval_CallObject(hook, args);
-		if (result == NULL) {
+if (result == NULL) {
-			PyObject *exception2, *v2, *tb2;
+PyObject *exception2, *v2, *tb2;
-			if (PyErr_ExceptionMatches(PyExc_SystemExit)) {
+if (PyErr_ExceptionMatches(PyExc_SystemExit)) {
-				handle_system_exit();
+handle_system_exit();
-			}
+}
-			PyErr_Fetch(&exception2, &v2, &tb2);
+PyErr_Fetch(&exception2, &v2, &tb2);
-			PyErr_NormalizeException(&exception2, &v2, &tb2);
+PyErr_NormalizeException(&exception2, &v2, &tb2);
-			/* It should not be possible for exception2 or v2
+/* It should not be possible for exception2 or v2
-			   to be NULL. However PyErr_Display() can't
+to be NULL. However PyErr_Display() can't
-			   tolerate NULLs, so just be safe. */
+tolerate NULLs, so just be safe. */
-			if (exception2 == NULL) {
+if (exception2 == NULL) {
-				exception2 = Py_None;
+exception2 = Py_None;
-				Py_INCREF(exception2);
+Py_INCREF(exception2);
-			}
+}
-			if (v2 == NULL) {
+if (v2 == NULL) {
-				v2 = Py_None;
+v2 = Py_None;
-				Py_INCREF(v2);
+Py_INCREF(v2);
-			}
+}
-			if (Py_FlushLine())
+if (Py_FlushLine())
-				PyErr_Clear();
+PyErr_Clear();
-			fflush(stdout);
+fflush(stdout);
-			PySys_WriteStderr("Error in sys.excepthook:\n");
+PySys_WriteStderr("Error in sys.excepthook:\n");
-			PyErr_Display(exception2, v2, tb2);
+PyErr_Display(exception2, v2, tb2);
-			PySys_WriteStderr("\nOriginal exception was:\n");
+PySys_WriteStderr("\nOriginal exception was:\n");
-			PyErr_Display(exception, v, tb);
+PyErr_Display(exception, v, tb);
-			Py_DECREF(exception2);
+Py_DECREF(exception2);
-			Py_DECREF(v2);
+Py_DECREF(v2);
-			Py_XDECREF(tb2);
+Py_XDECREF(tb2);
-		}
+}
-		Py_XDECREF(result);
+Py_XDECREF(result);
-		Py_XDECREF(args);
+Py_XDECREF(args);
-	} else {
+} else {
-		PySys_WriteStderr("sys.excepthook is missing\n");
+PySys_WriteStderr("sys.excepthook is missing\n");
-		PyErr_Display(exception, v, tb);
+PyErr_Display(exception, v, tb);
-	}
+}
-	Py_XDECREF(exception);
+Py_XDECREF(exception);
-	Py_XDECREF(v);
+Py_XDECREF(v);
-	Py_XDECREF(tb);
+Py_XDECREF(tb);
 }
 void
 PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb)
 {
-	int err = 0;
+int err = 0;
-	PyObject *f = PySys_GetObject("stderr");
+PyObject *f = PySys_GetObject("stderr");
-	Py_INCREF(value);
+Py_INCREF(value);
-	if (f == NULL)
+if (f == NULL)
-		fprintf(stderr, "lost sys.stderr\n");
+fprintf(stderr, "lost sys.stderr\n");
-	else {
+else {
-		if (Py_FlushLine())
+if (Py_FlushLine())
-			PyErr_Clear();
+PyErr_Clear();
-		fflush(stdout);
+fflush(stdout);
-		if (tb && tb != Py_None)
+if (tb && tb != Py_None)
-			err = PyTraceBack_Print(tb, f);
+err = PyTraceBack_Print(tb, f);
-		if (err == 0 &&
+if (err == 0 &&
-		    PyObject_HasAttrString(value, "print_file_and_line"))
+PyObject_HasAttrString(value, "print_file_and_line"))
-		{
+{
-			PyObject *message;
+PyObject *message;
-			const char *filename, *text;
+const char *filename, *text;
-			int lineno, offset;
+int lineno, offset;
-			if (!parse_syntax_error(value, &message, &filename,
+if (!parse_syntax_error(value, &message, &filename,
-						&lineno, &offset, &text))
+&lineno, &offset, &text))
-				PyErr_Clear();
+PyErr_Clear();
-			else {
+else {
-				char buf[10];
+char buf[10];
-				PyFile_WriteString("  File \"", f);
+PyFile_WriteString("  File \"", f);
-				if (filename == NULL)
+if (filename == NULL)
-					PyFile_WriteString("<string>", f);
+PyFile_WriteString("<string>", f);
-				else
+else
-					PyFile_WriteString(filename, f);
+PyFile_WriteString(filename, f);
-				PyFile_WriteString("\", line ", f);
+PyFile_WriteString("\", line ", f);
-				PyOS_snprintf(buf, sizeof(buf), "%d", lineno);
+PyOS_snprintf(buf, sizeof(buf), "%d", lineno);
-				PyFile_WriteString(buf, f);
+PyFile_WriteString(buf, f);
-				PyFile_WriteString("\n", f);
+PyFile_WriteString("\n", f);
-				if (text != NULL)
+if (text != NULL)
-					print_error_text(f, offset, text);
+print_error_text(f, offset, text);
-				Py_DECREF(value);
+Py_DECREF(value);
-				value = message;
+value = message;
-				/* Can't be bothered to check all those
+/* Can't be bothered to check all those
-				   PyFile_WriteString() calls */
+PyFile_WriteString() calls */
-				if (PyErr_Occurred())
+if (PyErr_Occurred())
-					err = -1;
+err = -1;
-			}
+}
-		}
+}
-		if (err) {
+if (err) {
-			/* Don't do anything else */
+/* Don't do anything else */
-		}
+}
-		else if (PyExceptionClass_Check(exception)) {
+else if (PyExceptionClass_Check(exception)) {
-			PyObject* moduleName;
+PyObject* moduleName;
-			char* className = PyExceptionClass_Name(exception);
+char* className = PyExceptionClass_Name(exception);
-			if (className != NULL) {
+if (className != NULL) {
-				char *dot = strrchr(className, '.');
+char *dot = strrchr(className, '.');
-				if (dot != NULL)
+if (dot != NULL)
-					className = dot+1;
+className = dot+1;
-			}
+}
-			moduleName = PyObject_GetAttrString(exception, "__module__");
+moduleName = PyObject_GetAttrString(exception, "__module__");
-			if (moduleName == NULL)
+if (moduleName == NULL)
-				err = PyFile_WriteString("<unknown>", f);
+err = PyFile_WriteString("<unknown>", f);
-			else {
+else {
-				char* modstr = PyString_AsString(moduleName);
+char* modstr = PyString_AsString(moduleName);
-				if (modstr && strcmp(modstr, "exceptions"))
+if (modstr && strcmp(modstr, "exceptions"))
-				{
+{
-					err = PyFile_WriteString(modstr, f);
+err = PyFile_WriteString(modstr, f);
-					err += PyFile_WriteString(".", f);
+err += PyFile_WriteString(".", f);
-				}
+}
-				Py_DECREF(moduleName);
+Py_DECREF(moduleName);
-			}
+}
-			if (err == 0) {
+if (err == 0) {
-				if (className == NULL)
+if (className == NULL)
-				      err = PyFile_WriteString("<unknown>", f);
+err = PyFile_WriteString("<unknown>", f);
-				else
+else
-				      err = PyFile_WriteString(className, f);
+err = PyFile_WriteString(className, f);
-			}
+}
-		}
+}
-		else
+else
-			err = PyFile_WriteObject(exception, f, Py_PRINT_RAW);
+err = PyFile_WriteObject(exception, f, Py_PRINT_RAW);
-		if (err == 0 && (value != Py_None)) {
+if (err == 0 && (value != Py_None)) {
-			PyObject *s = PyObject_Str(value);
+PyObject *s = PyObject_Str(value);
-			/* only print colon if the str() of the
+/* only print colon if the str() of the
-			   object is not the empty string
+object is not the empty string
-			*/
+*/
-			if (s == NULL)
+if (s == NULL)
-				err = -1;
+err = -1;
-			else if (!PyString_Check(s) ||
+else if (!PyString_Check(s) ||
-				 PyString_GET_SIZE(s) != 0)
+PyString_GET_SIZE(s) != 0)
-				err = PyFile_WriteString(": ", f);
+err = PyFile_WriteString(": ", f);
-			if (err == 0)
+if (err == 0)
-			  err = PyFile_WriteObject(s, f, Py_PRINT_RAW);
+err = PyFile_WriteObject(s, f, Py_PRINT_RAW);
-			Py_XDECREF(s);
+Py_XDECREF(s);
-		}
+}
-		/* try to write a newline in any case */
+/* try to write a newline in any case */
-		err += PyFile_WriteString("\n", f);
+err += PyFile_WriteString("\n", f);
-	}
+}
-	Py_DECREF(value);
+Py_DECREF(value);
-	/* If an error happened here, don't show it.
+/* If an error happened here, don't show it.
-	   XXX This is wrong, but too many callers rely on this behavior. */
+XXX This is wrong, but too many callers rely on this behavior. */
-	if (err != 0)
+if (err != 0)
-		PyErr_Clear();
+PyErr_Clear();
 }
 PyObject *
 PyRun_StringFlags(const char *str, int start, PyObject *globals,
-		  PyObject *locals, PyCompilerFlags *flags)
+PyObject *locals, PyCompilerFlags *flags)
 {
-	PyObject *ret = NULL;
+PyObject *ret = NULL;
-	mod_ty mod;
+mod_ty mod;
-	PyArena *arena = PyArena_New();
+PyArena *arena = PyArena_New();
-	if (arena == NULL)
+if (arena == NULL)
-		return NULL;
+return NULL;
-	mod = PyParser_ASTFromString(str, "<string>", start, flags, arena);
+mod = PyParser_ASTFromString(str, "<string>", start, flags, arena);
-	if (mod != NULL)
+if (mod != NULL)
-		ret = run_mod(mod, "<string>", globals, locals, flags, arena);
+ret = run_mod(mod, "<string>", globals, locals, flags, arena);
-	PyArena_Free(arena);
+PyArena_Free(arena);
-	return ret;
+return ret;
 }
 PyObject *
 PyRun_FileExFlags(FILE *fp, const char *filename, int start, PyObject *globals,
-		  PyObject *locals, int closeit, PyCompilerFlags *flags)
+PyObject *locals, int closeit, PyCompilerFlags *flags)
 {
-	PyObject *ret;
+PyObject *ret;
-	mod_ty mod;
+mod_ty mod;
-	PyArena *arena = PyArena_New();
+PyArena *arena = PyArena_New();
-	if (arena == NULL)
+if (arena == NULL)
-		return NULL;
+return NULL;
-	mod = PyParser_ASTFromFile(fp, filename, start, 0, 0,
+mod = PyParser_ASTFromFile(fp, filename, start, 0, 0,
-				   flags, NULL, arena);
+flags, NULL, arena);
-	if (closeit)
+if (closeit)
-		fclose(fp);
+fclose(fp);
-	if (mod == NULL) {
+if (mod == NULL) {
-		PyArena_Free(arena);
+PyArena_Free(arena);
-		return NULL;
+return NULL;
-	}
+}
-	ret = run_mod(mod, filename, globals, locals, flags, arena);
+ret = run_mod(mod, filename, globals, locals, flags, arena);
-	PyArena_Free(arena);
+PyArena_Free(arena);
-	return ret;
+return ret;
 }
 static PyObject *
 run_mod(mod_ty mod, const char *filename, PyObject *globals, PyObject *locals,
-	 PyCompilerFlags *flags, PyArena *arena)
+PyCompilerFlags *flags, PyArena *arena)
 {
-	PyCodeObject *co;
+PyCodeObject *co;
-	PyObject *v;
+PyObject *v;
-	co = PyAST_Compile(mod, filename, flags, arena);
+co = PyAST_Compile(mod, filename, flags, arena);
-	if (co == NULL)
+if (co == NULL)
-		return NULL;
+return NULL;
-	v = PyEval_EvalCode(co, globals, locals);
+v = PyEval_EvalCode(co, globals, locals);
-	Py_DECREF(co);
+Py_DECREF(co);
-	return v;
+return v;
 }
 static PyObject *
 run_pyc_file(FILE *fp, const char *filename, PyObject *globals,
-	     PyObject *locals, PyCompilerFlags *flags)
+PyObject *locals, PyCompilerFlags *flags)
 {
-	PyCodeObject *co;
+PyCodeObject *co;
-	PyObject *v;
+PyObject *v;
-	long magic;
+long magic;
-	long PyImport_GetMagicNumber(void);
+long PyImport_GetMagicNumber(void);
-	magic = PyMarshal_ReadLongFromFile(fp);
+magic = PyMarshal_ReadLongFromFile(fp);
-	if (magic != PyImport_GetMagicNumber()) {
+if (magic != PyImport_GetMagicNumber()) {
-		PyErr_SetString(PyExc_RuntimeError,
+PyErr_SetString(PyExc_RuntimeError,
-			   "Bad magic number in .pyc file");
+"Bad magic number in .pyc file");
-		return NULL;
+return NULL;
-	}
+}
-	(void) PyMarshal_ReadLongFromFile(fp);
+(void) PyMarshal_ReadLongFromFile(fp);
-	v = PyMarshal_ReadLastObjectFromFile(fp);
+v = PyMarshal_ReadLastObjectFromFile(fp);
-	fclose(fp);
+fclose(fp);
-	if (v == NULL || !PyCode_Check(v)) {
+if (v == NULL || !PyCode_Check(v)) {
-		Py_XDECREF(v);
+Py_XDECREF(v);
-		PyErr_SetString(PyExc_RuntimeError,
+PyErr_SetString(PyExc_RuntimeError,
-			   "Bad code object in .pyc file");
+"Bad code object in .pyc file");
-		return NULL;
+return NULL;
-	}
+}
-	co = (PyCodeObject *)v;
+co = (PyCodeObject *)v;
-	v = PyEval_EvalCode(co, globals, locals);
+v = PyEval_EvalCode(co, globals, locals);
-	if (v && flags)
+if (v && flags)
-		flags->cf_flags |= (co->co_flags & PyCF_MASK);
+flags->cf_flags |= (co->co_flags & PyCF_MASK);
-	Py_DECREF(co);
+Py_DECREF(co);
-	return v;
+return v;
 }
 PyObject *
 Py_CompileStringFlags(const char *str, const char *filename, int start,
-		      PyCompilerFlags *flags)
+PyCompilerFlags *flags)
 {
-	PyCodeObject *co;
+PyCodeObject *co;
-	mod_ty mod;
+mod_ty mod;
-	PyArena *arena = PyArena_New();
+PyArena *arena = PyArena_New();
-	if (arena == NULL)
+if (arena == NULL)
-		return NULL;
+return NULL;
-	mod = PyParser_ASTFromString(str, filename, start, flags, arena);
+mod = PyParser_ASTFromString(str, filename, start, flags, arena);
-	if (mod == NULL) {
+if (mod == NULL) {
-		PyArena_Free(arena);
+PyArena_Free(arena);
-		return NULL;
+return NULL;
-	}
+}
-	if (flags && (flags->cf_flags & PyCF_ONLY_AST)) {
+if (flags && (flags->cf_flags & PyCF_ONLY_AST)) {
-		PyObject *result = PyAST_mod2obj(mod);
+PyObject *result = PyAST_mod2obj(mod);
-		PyArena_Free(arena);
+PyArena_Free(arena);
-		return result;
+return result;
-	}
+}
-	co = PyAST_Compile(mod, filename, flags, arena);
+co = PyAST_Compile(mod, filename, flags, arena);
-	PyArena_Free(arena);
+PyArena_Free(arena);
-	return (PyObject *)co;
+return (PyObject *)co;
 }
 struct symtable *
 Py_SymtableString(const char *str, const char *filename, int start)
 {
-	struct symtable *st;
+struct symtable *st;
-	mod_ty mod;
+mod_ty mod;
-	PyCompilerFlags flags;
+PyCompilerFlags flags;
-	PyArena *arena = PyArena_New();
+PyArena *arena = PyArena_New();
-	if (arena == NULL)
+if (arena == NULL)
-		return NULL;
+return NULL;
-	flags.cf_flags = 0;
+flags.cf_flags = 0;
-	mod = PyParser_ASTFromString(str, filename, start, &flags, arena);
+mod = PyParser_ASTFromString(str, filename, start, &flags, arena);
-	if (mod == NULL) {
+if (mod == NULL) {
-		PyArena_Free(arena);
+PyArena_Free(arena);
-		return NULL;
+return NULL;
-	}
+}
-	st = PySymtable_Build(mod, filename, 0);
+st = PySymtable_Build(mod, filename, 0);
-	PyArena_Free(arena);
+PyArena_Free(arena);
-	return st;
+return st;
 }
 /* Preferred access to parser is through AST. */
 mod_ty
 PyParser_ASTFromString(const char *s, const char *filename, int start,
-		       PyCompilerFlags *flags, PyArena *arena)
+PyCompilerFlags *flags, PyArena *arena)
 {
-	mod_ty mod;
+mod_ty mod;
-	PyCompilerFlags localflags;
+PyCompilerFlags localflags;
-	perrdetail err;
+perrdetail err;
-	int iflags = PARSER_FLAGS(flags);
+int iflags = PARSER_FLAGS(flags);
-	node *n = PyParser_ParseStringFlagsFilenameEx(s, filename,
+node *n = PyParser_ParseStringFlagsFilenameEx(s, filename,
-					&_PyParser_Grammar, start, &err,
+&_PyParser_Grammar, start, &err,
-					&iflags);
+&iflags);
-	if (flags == NULL) {
+if (flags == NULL) {
-		localflags.cf_flags = 0;
+localflags.cf_flags = 0;
-		flags = &localflags;
+flags = &localflags;
-	}
+}
-	if (n) {
+if (n) {
-		flags->cf_flags |= iflags & PyCF_MASK;
+flags->cf_flags |= iflags & PyCF_MASK;
-		mod = PyAST_FromNode(n, flags, filename, arena);
+mod = PyAST_FromNode(n, flags, filename, arena);
-		PyNode_Free(n);
+PyNode_Free(n);
-		return mod;
+return mod;
-	}
+}
-	else {
+else {
-		err_input(&err);
+err_input(&err);
-		return NULL;
+return NULL;
-	}
+}
 }
 mod_ty
 PyParser_ASTFromFile(FILE *fp, const char *filename, int start, char *ps1,
-		     char *ps2, PyCompilerFlags *flags, int *errcode,
+char *ps2, PyCompilerFlags *flags, int *errcode,
-		     PyArena *arena)
+PyArena *arena)
 {
-	mod_ty mod;
+mod_ty mod;
-	PyCompilerFlags localflags;
+PyCompilerFlags localflags;
-	perrdetail err;
+perrdetail err;
-	int iflags = PARSER_FLAGS(flags);
+int iflags = PARSER_FLAGS(flags);
-	node *n = PyParser_ParseFileFlagsEx(fp, filename, &_PyParser_Grammar,
+node *n = PyParser_ParseFileFlagsEx(fp, filename, &_PyParser_Grammar,
-				start, ps1, ps2, &err, &iflags);
+start, ps1, ps2, &err, &iflags);
-	if (flags == NULL) {
+if (flags == NULL) {
-		localflags.cf_flags = 0;
+localflags.cf_flags = 0;
-		flags = &localflags;
+flags = &localflags;
-	}
+}
-	if (n) {
+if (n) {
-		flags->cf_flags |= iflags & PyCF_MASK;
+flags->cf_flags |= iflags & PyCF_MASK;
-		mod = PyAST_FromNode(n, flags, filename, arena);
+mod = PyAST_FromNode(n, flags, filename, arena);
-		PyNode_Free(n);
+PyNode_Free(n);
-		return mod;
+return mod;
-	}
+}
-	else {
+else {
-		err_input(&err);
+err_input(&err);
-		if (errcode)
+if (errcode)
-			*errcode = err.error;
+*errcode = err.error;
-		return NULL;
+return NULL;
-	}
+}
 }
 /* Simplified interface to parsefile -- return node or set exception */
 node *
 PyParser_SimpleParseFileFlags(FILE *fp, const char *filename, int start, int flags)
 {
-	perrdetail err;
+perrdetail err;
-	node *n = PyParser_ParseFileFlags(fp, filename, &_PyParser_Grammar,
+node *n = PyParser_ParseFileFlags(fp, filename, &_PyParser_Grammar,
-					  start, NULL, NULL, &err, flags);
+start, NULL, NULL, &err, flags);
-	if (n == NULL)
+if (n == NULL)
-		err_input(&err);
+err_input(&err);
-	return n;
+return n;
 }
 /* Simplified interface to parsestring -- return node or set exception */
 node *
 PyParser_SimpleParseStringFlags(const char *str, int start, int flags)
 {
-	perrdetail err;
+perrdetail err;
-	node *n = PyParser_ParseStringFlags(str, &_PyParser_Grammar,
+node *n = PyParser_ParseStringFlags(str, &_PyParser_Grammar,
-					    start, &err, flags);
+start, &err, flags);
-	if (n == NULL)
+if (n == NULL)
-		err_input(&err);
+err_input(&err);
-	return n;
+return n;
 }
 node *
 PyParser_SimpleParseStringFlagsFilename(const char *str, const char *filename,
-					int start, int flags)
+int start, int flags)
 {
-	perrdetail err;
+perrdetail err;
-	node *n = PyParser_ParseStringFlagsFilename(str, filename,
+node *n = PyParser_ParseStringFlagsFilename(str, filename,
-				&_PyParser_Grammar, start, &err, flags);
+&_PyParser_Grammar, start, &err, flags);
-	if (n == NULL)
+if (n == NULL)
-		err_input(&err);
+err_input(&err);
-	return n;
+return n;
 }
 node *
 PyParser_SimpleParseStringFilename(const char *str, const char *filename, int start)
 {
-	return PyParser_SimpleParseStringFlagsFilename(str, filename, start, 0);
+return PyParser_SimpleParseStringFlagsFilename(str, filename, start, 0);
 }
 /* May want to move a more generalized form of this to parsetok.c or
 even parser modules. */
 void
 PyParser_SetError(perrdetail *err)
 {
-	err_input(err);
+err_input(err);
 }
 /* Set the error appropriate to the given input error code (see errcode.h) */
 static void
 err_input(perrdetail *err)
 {
-	PyObject *v, *w, *errtype;
+PyObject *v, *w, *errtype;
-	PyObject* u = NULL;
+PyObject* u = NULL;
-	char *msg = NULL;
+char *msg = NULL;
-	errtype = PyExc_SyntaxError;
+errtype = PyExc_SyntaxError;
-	switch (err->error) {
+switch (err->error) {
-	case E_ERROR:
+case E_ERROR:
-		return;
+return;
-	case E_SYNTAX:
+case E_SYNTAX:
-		errtype = PyExc_IndentationError;
+errtype = PyExc_IndentationError;
-		if (err->expected == INDENT)
+if (err->expected == INDENT)
-			msg = "expected an indented block";
+msg = "expected an indented block";
-		else if (err->token == INDENT)
+else if (err->token == INDENT)
-			msg = "unexpected indent";
+msg = "unexpected indent";
-		else if (err->token == DEDENT)
+else if (err->token == DEDENT)
-			msg = "unexpected unindent";
+msg = "unexpected unindent";
-		else {
+else {
-			errtype = PyExc_SyntaxError;
+errtype = PyExc_SyntaxError;
-			msg = "invalid syntax";
+msg = "invalid syntax";
-		}
+}
-		break;
+break;
-	case E_TOKEN:
+case E_TOKEN:
-		msg = "invalid token";
+msg = "invalid token";
-		break;
+break;
-	case E_EOFS:
+case E_EOFS:
-		msg = "EOF while scanning triple-quoted string literal";
+msg = "EOF while scanning triple-quoted string literal";
-		break;
+break;
-	case E_EOLS:
+case E_EOLS:
-		msg = "EOL while scanning string literal";
+msg = "EOL while scanning string literal";
-		break;
+break;
-	case E_INTR:
+case E_INTR:
-		if (!PyErr_Occurred())
+if (!PyErr_Occurred())
-			PyErr_SetNone(PyExc_KeyboardInterrupt);
+PyErr_SetNone(PyExc_KeyboardInterrupt);
-		goto cleanup;
+goto cleanup;
-	case E_NOMEM:
+case E_NOMEM:
-		PyErr_NoMemory();
+PyErr_NoMemory();
-		goto cleanup;
+goto cleanup;
-	case E_EOF:
+case E_EOF:
-		msg = "unexpected EOF while parsing";
+msg = "unexpected EOF while parsing";
-		break;
+break;
-	case E_TABSPACE:
+case E_TABSPACE:
-		errtype = PyExc_TabError;
+errtype = PyExc_TabError;
-		msg = "inconsistent use of tabs and spaces in indentation";
+msg = "inconsistent use of tabs and spaces in indentation";
-		break;
+break;
-	case E_OVERFLOW:
+case E_OVERFLOW:
-		msg = "expression too long";
+msg = "expression too long";
-		break;
+break;
-	case E_DEDENT:
+case E_DEDENT:
-		errtype = PyExc_IndentationError;
+errtype = PyExc_IndentationError;
-		msg = "unindent does not match any outer indentation level";
+msg = "unindent does not match any outer indentation level";
-		break;
+break;
-	case E_TOODEEP:
+case E_TOODEEP:
-		errtype = PyExc_IndentationError;
+errtype = PyExc_IndentationError;
-		msg = "too many levels of indentation";
+msg = "too many levels of indentation";
-		break;
+break;
-	case E_DECODE: {
+case E_DECODE: {
-		PyObject *type, *value, *tb;
+PyObject *type, *value, *tb;
-		PyErr_Fetch(&type, &value, &tb);
+PyErr_Fetch(&type, &value, &tb);
-		if (value != NULL) {
+if (value != NULL) {
-			u = PyObject_Str(value);
+u = PyObject_Str(value);
-			if (u != NULL) {
+if (u != NULL) {
-				msg = PyString_AsString(u);
+msg = PyString_AsString(u);
-			}
+}
-		}
+}
-		if (msg == NULL)
+if (msg == NULL)
-			msg = "unknown decode error";
+msg = "unknown decode error";
-		Py_XDECREF(type);
+Py_XDECREF(type);
-		Py_XDECREF(value);
+Py_XDECREF(value);
-		Py_XDECREF(tb);
+Py_XDECREF(tb);
-		break;
+break;
-	}
+}
-	case E_LINECONT:
+case E_LINECONT:
-		msg = "unexpected character after line continuation character";
+msg = "unexpected character after line continuation character";
-		break;
+break;
-	default:
+default:
-		fprintf(stderr, "error=%d\n", err->error);
+fprintf(stderr, "error=%d\n", err->error);
-		msg = "unknown parsing error";
+msg = "unknown parsing error";
-		break;
+break;
-	}
+}
-	v = Py_BuildValue("(ziiz)", err->filename,
+v = Py_BuildValue("(ziiz)", err->filename,
-			  err->lineno, err->offset, err->text);
+err->lineno, err->offset, err->text);
-	w = NULL;
+w = NULL;
-	if (v != NULL)
+if (v != NULL)
-		w = Py_BuildValue("(sO)", msg, v);
+w = Py_BuildValue("(sO)", msg, v);
-	Py_XDECREF(u);
+Py_XDECREF(u);
-	Py_XDECREF(v);
+Py_XDECREF(v);
-	PyErr_SetObject(errtype, w);
+PyErr_SetObject(errtype, w);
-	Py_XDECREF(w);
+Py_XDECREF(w);
 cleanup:
-	if (err->text != NULL) {
+if (err->text != NULL) {
-		PyObject_FREE(err->text);
+PyObject_FREE(err->text);
-		err->text = NULL;
+err->text = NULL;
-	}
+}
 }
 /* Print fatal error message and abort */
 void
 Py_FatalError(const char *msg)
 {
-	fprintf(stderr, "Fatal Python error: %s\n", msg);
+fprintf(stderr, "Fatal Python error: %s\n", msg);
-	fflush(stderr); /* it helps in Windows debug build */
+fflush(stderr); /* it helps in Windows debug build */
 #ifdef MS_WINDOWS
-	{
+{
-		size_t len = strlen(msg);
+size_t len = strlen(msg);
-		WCHAR* buffer;
+WCHAR* buffer;
-		size_t i;
+size_t i;
-		/* Convert the message to wchar_t. This uses a simple one-to-one
+/* Convert the message to wchar_t. This uses a simple one-to-one
-		conversion, assuming that the this error message actually uses ASCII
+conversion, assuming that the this error message actually uses ASCII
-		only. If this ceases to be true, we will have to convert. */
+only. If this ceases to be true, we will have to convert. */
-		buffer = alloca( (len+1) * (sizeof *buffer));
+buffer = alloca( (len+1) * (sizeof *buffer));
-		for( i=0; i<=len; ++i)
+for( i=0; i<=len; ++i)
-			buffer[i] = msg[i];
+buffer[i] = msg[i];
-		OutputDebugStringW(L"Fatal Python error: ");
+OutputDebugStringW(L"Fatal Python error: ");
-		OutputDebugStringW(buffer);
+OutputDebugStringW(buffer);
-		OutputDebugStringW(L"\n");
+OutputDebugStringW(L"\n");
-	}
+}
 #ifdef _DEBUG
-	DebugBreak();
+DebugBreak();
 #endif
 #endif /* MS_WINDOWS */
-	abort();
+abort();
 }
 /* Clean up and exit */
 #ifdef WITH_THREAD
 "threading" threads have completed. */
 static void
 wait_for_thread_shutdown(void)
 {
 #ifdef WITH_THREAD
-	PyObject *result;
+PyObject *result;
-	PyThreadState *tstate = PyThreadState_GET();
+PyThreadState *tstate = PyThreadState_GET();
-	PyObject *threading = PyMapping_GetItemString(tstate->interp->modules,
+PyObject *threading = PyMapping_GetItemString(tstate->interp->modules,
-						      "threading");
+"threading");
-	if (threading == NULL) {
+if (threading == NULL) {
-		/* threading not imported */
+/* threading not imported */
-		PyErr_Clear();
+PyErr_Clear();
-		return;
+return;
-	}
+}
-	result = PyObject_CallMethod(threading, "_shutdown", "");
+result = PyObject_CallMethod(threading, "_shutdown", "");
-	if (result == NULL)
+if (result == NULL)
-		PyErr_WriteUnraisable(threading);
+PyErr_WriteUnraisable(threading);
-	else
+else
-		Py_DECREF(result);
+Py_DECREF(result);
-	Py_DECREF(threading);
+Py_DECREF(threading);
 #endif
 }
 #define NEXITFUNCS 32
 static void (*exitfuncs[NEXITFUNCS])(void);
 static int nexitfuncs = 0;
 int Py_AtExit(void (*func)(void))
 {
-	if (nexitfuncs >= NEXITFUNCS)
+if (nexitfuncs >= NEXITFUNCS)
-		return -1;
+return -1;
-	exitfuncs[nexitfuncs++] = func;
+exitfuncs[nexitfuncs++] = func;
-	return 0;
+return 0;
 }
 static void
 call_sys_exitfunc(void)
 {
-	PyObject *exitfunc = PySys_GetObject("exitfunc");
+PyObject *exitfunc = PySys_GetObject("exitfunc");
-	if (exitfunc) {
+if (exitfunc) {
-		PyObject *res;
+PyObject *res;
-		Py_INCREF(exitfunc);
+Py_INCREF(exitfunc);
-		PySys_SetObject("exitfunc", (PyObject *)NULL);
+PySys_SetObject("exitfunc", (PyObject *)NULL);
-		res = PyEval_CallObject(exitfunc, (PyObject *)NULL);
+res = PyEval_CallObject(exitfunc, (PyObject *)NULL);
-		if (res == NULL) {
+if (res == NULL) {
-			if (!PyErr_ExceptionMatches(PyExc_SystemExit)) {
+if (!PyErr_ExceptionMatches(PyExc_SystemExit)) {
-				PySys_WriteStderr("Error in sys.exitfunc:\n");
+PySys_WriteStderr("Error in sys.exitfunc:\n");
-			}
+}
-			PyErr_Print();
+PyErr_Print();
-		}
+}
-		Py_DECREF(exitfunc);
+Py_DECREF(exitfunc);
-	}
+}
-	if (Py_FlushLine())
+if (Py_FlushLine())
-		PyErr_Clear();
+PyErr_Clear();
 }
 static void
 call_ll_exitfuncs(void)
 {
-	while (nexitfuncs > 0)
+while (nexitfuncs > 0)
-		(*exitfuncs[--nexitfuncs])();
+(*exitfuncs[--nexitfuncs])();
-	fflush(stdout);
+fflush(stdout);
-	fflush(stderr);
+fflush(stderr);
 }
 void
 Py_Exit(int sts)
 {
-	Py_Finalize();
+Py_Finalize();
-	exit(sts);
+exit(sts);
 }
 static void
 initsigs(void)
 {
 #ifdef SIGPIPE
-	PyOS_setsig(SIGPIPE, SIG_IGN);
+PyOS_setsig(SIGPIPE, SIG_IGN);
 #endif
 #ifdef SIGXFZ
-	PyOS_setsig(SIGXFZ, SIG_IGN);
+PyOS_setsig(SIGXFZ, SIG_IGN);
 #endif
 #ifdef SIGXFSZ
-	PyOS_setsig(SIGXFSZ, SIG_IGN);
+PyOS_setsig(SIGXFSZ, SIG_IGN);
 #endif
-	PyOS_InitInterrupts(); /* May imply initsignal() */
+PyOS_InitInterrupts(); /* May imply initsignal() */
 }
 /*
 * The file descriptor fd is considered ``interactive'' if either
 *      the descriptor is NULL or "<stdin>" or "???".
 */
 int
 Py_FdIsInteractive(FILE *fp, const char *filename)
 {
-	if (isatty((int)fileno(fp)))
+if (isatty((int)fileno(fp)))
-		return 1;
+return 1;
-	if (!Py_InteractiveFlag)
+if (!Py_InteractiveFlag)
-		return 0;
+return 0;
-	return (filename == NULL) ||
+return (filename == NULL) ||
-	       (strcmp(filename, "<stdin>") == 0) ||
+(strcmp(filename, "<stdin>") == 0) ||
-	       (strcmp(filename, "???") == 0);
+(strcmp(filename, "???") == 0);
 }
 #if defined(USE_STACKCHECK)
 #if defined(WIN32) && defined(_MSC_VER)
 * Return non-zero when we run out of memory on the stack; zero otherwise.
 */
 int
 PyOS_CheckStack(void)
 {
-	__try {
+__try {
-		/* alloca throws a stack overflow exception if there's
+/* alloca throws a stack overflow exception if there's
-		   not enough space left on the stack */
+not enough space left on the stack */
-		alloca(PYOS_STACK_MARGIN * sizeof(void*));
+alloca(PYOS_STACK_MARGIN * sizeof(void*));
-		return 0;
+return 0;
-	} __except (GetExceptionCode() == STATUS_STACK_OVERFLOW ?
+} __except (GetExceptionCode() == STATUS_STACK_OVERFLOW ?
-		        EXCEPTION_EXECUTE_HANDLER :
+EXCEPTION_EXECUTE_HANDLER :
-		        EXCEPTION_CONTINUE_SEARCH) {
+EXCEPTION_CONTINUE_SEARCH) {
-		int errcode = _resetstkoflw();
+int errcode = _resetstkoflw();
-		if (errcode == 0)
+if (errcode == 0)
-		{
+{
-			Py_FatalError("Could not reset the stack!");
+Py_FatalError("Could not reset the stack!");
-		}
+}
-	}
+}
-	return 1;
+return 1;
 }
 #endif /* WIN32 && _MSC_VER */
 /* Alternate implementations can be added here... */
 PyOS_sighandler_t
 PyOS_getsig(int sig)
 {
 #ifdef HAVE_SIGACTION
-	struct sigaction context;
+struct sigaction context;
-	if (sigaction(sig, NULL, &context) == -1)
+if (sigaction(sig, NULL, &context) == -1)
-		return SIG_ERR;
+return SIG_ERR;
-	return context.sa_handler;
+return context.sa_handler;
 #else
-	PyOS_sighandler_t handler;
+PyOS_sighandler_t handler;
 /* Special signal handling for the secure CRT in Visual Studio 2005 */
 #if defined(_MSC_VER) && _MSC_VER >= 1400
-	switch (sig) {
+switch (sig) {
-	/* Only these signals are valid */
+/* Only these signals are valid */
-	case SIGINT:
+case SIGINT:
-	case SIGILL:
+case SIGILL:
-	case SIGFPE:
+case SIGFPE:
-	case SIGSEGV:
+case SIGSEGV:
-	case SIGTERM:
+case SIGTERM:
-	case SIGBREAK:
+case SIGBREAK:
-	case SIGABRT:
+case SIGABRT:
-		break;
+break;
-	/* Don't call signal() with other values or it will assert */
+/* Don't call signal() with other values or it will assert */
-	default:
+default:
-		return SIG_ERR;
+return SIG_ERR;
-	}
+}
 #endif /* _MSC_VER && _MSC_VER >= 1400 */
-	handler = signal(sig, SIG_IGN);
+handler = signal(sig, SIG_IGN);
-	if (handler != SIG_ERR)
+if (handler != SIG_ERR)
-		signal(sig, handler);
+signal(sig, handler);
-	return handler;
+return handler;
 #endif
 }
 PyOS_sighandler_t
 PyOS_setsig(int sig, PyOS_sighandler_t handler)
 {
 #ifdef HAVE_SIGACTION
-	/* Some code in Modules/signalmodule.c depends on sigaction() being
+/* Some code in Modules/signalmodule.c depends on sigaction() being
-	 * used here if HAVE_SIGACTION is defined.  Fix that if this code
+* used here if HAVE_SIGACTION is defined.  Fix that if this code
-	 * changes to invalidate that assumption.
+* changes to invalidate that assumption.
-	 */
+*/
-	struct sigaction context, ocontext;
+struct sigaction context, ocontext;
-	context.sa_handler = handler;
+context.sa_handler = handler;
-	sigemptyset(&context.sa_mask);
+sigemptyset(&context.sa_mask);
-	context.sa_flags = 0;
+context.sa_flags = 0;
-	if (sigaction(sig, &context, &ocontext) == -1)
+if (sigaction(sig, &context, &ocontext) == -1)
-		return SIG_ERR;
+return SIG_ERR;
-	return ocontext.sa_handler;
+return ocontext.sa_handler;
 #else
-	PyOS_sighandler_t oldhandler;
+PyOS_sighandler_t oldhandler;
-	oldhandler = signal(sig, handler);
+oldhandler = signal(sig, handler);
 #ifdef HAVE_SIGINTERRUPT
-	siginterrupt(sig, 1);
+siginterrupt(sig, 1);
 #endif
-	return oldhandler;
+return oldhandler;
 #endif
 }
 /* Deprecated C API functions still provided for binary compatiblity */
 #undef PyParser_SimpleParseFile
 PyAPI_FUNC(node *)
 PyParser_SimpleParseFile(FILE *fp, const char *filename, int start)
 {
-	return PyParser_SimpleParseFileFlags(fp, filename, start, 0);
+return PyParser_SimpleParseFileFlags(fp, filename, start, 0);
 }
 #undef PyParser_SimpleParseString
 PyAPI_FUNC(node *)
 PyParser_SimpleParseString(const char *str, int start)
 {
-	return PyParser_SimpleParseStringFlags(str, start, 0);
+return PyParser_SimpleParseStringFlags(str, start, 0);
 }
 #undef PyRun_AnyFile
 PyAPI_FUNC(int)
 PyRun_AnyFile(FILE *fp, const char *name)
 {
-	return PyRun_AnyFileExFlags(fp, name, 0, NULL);
+return PyRun_AnyFileExFlags(fp, name, 0, NULL);
 }
 #undef PyRun_AnyFileEx
 PyAPI_FUNC(int)
 PyRun_AnyFileEx(FILE *fp, const char *name, int closeit)
 {
-	return PyRun_AnyFileExFlags(fp, name, closeit, NULL);
+return PyRun_AnyFileExFlags(fp, name, closeit, NULL);
 }
 #undef PyRun_AnyFileFlags
 PyAPI_FUNC(int)
 PyRun_AnyFileFlags(FILE *fp, const char *name, PyCompilerFlags *flags)
 {
-	return PyRun_AnyFileExFlags(fp, name, 0, flags);
+return PyRun_AnyFileExFlags(fp, name, 0, flags);
 }
 #undef PyRun_File
 PyAPI_FUNC(PyObject *)
 PyRun_File(FILE *fp, const char *p, int s, PyObject *g, PyObject *l)
 {
-	return PyRun_FileExFlags(fp, p, s, g, l, 0, NULL);
+return PyRun_FileExFlags(fp, p, s, g, l, 0, NULL);
 }
 #undef PyRun_FileEx
 PyAPI_FUNC(PyObject *)
 PyRun_FileEx(FILE *fp, const char *p, int s, PyObject *g, PyObject *l, int c)
 {
-	return PyRun_FileExFlags(fp, p, s, g, l, c, NULL);
+return PyRun_FileExFlags(fp, p, s, g, l, c, NULL);
 }
 #undef PyRun_FileFlags
 PyAPI_FUNC(PyObject *)
 PyRun_FileFlags(FILE *fp, const char *p, int s, PyObject *g, PyObject *l,
-		PyCompilerFlags *flags)
+PyCompilerFlags *flags)
 {
-	return PyRun_FileExFlags(fp, p, s, g, l, 0, flags);
+return PyRun_FileExFlags(fp, p, s, g, l, 0, flags);
 }
 #undef PyRun_SimpleFile
 PyAPI_FUNC(int)
 PyRun_SimpleFile(FILE *f, const char *p)
 {
-	return PyRun_SimpleFileExFlags(f, p, 0, NULL);
+return PyRun_SimpleFileExFlags(f, p, 0, NULL);
 }
 #undef PyRun_SimpleFileEx
 PyAPI_FUNC(int)
 PyRun_SimpleFileEx(FILE *f, const char *p, int c)
 {
-	return PyRun_SimpleFileExFlags(f, p, c, NULL);
+return PyRun_SimpleFileExFlags(f, p, c, NULL);
 }
 #undef PyRun_String
 PyAPI_FUNC(PyObject *)
 PyRun_String(const char *str, int s, PyObject *g, PyObject *l)
 {
-	return PyRun_StringFlags(str, s, g, l, NULL);
+return PyRun_StringFlags(str, s, g, l, NULL);
 }
 #undef PyRun_SimpleString
 PyAPI_FUNC(int)
 PyRun_SimpleString(const char *s)
 {
-	return PyRun_SimpleStringFlags(s, NULL);
+return PyRun_SimpleStringFlags(s, NULL);
 }
 #undef Py_CompileString
 PyAPI_FUNC(PyObject *)
 Py_CompileString(const char *str, const char *p, int s)
 {
-	return Py_CompileStringFlags(str, p, s, NULL);
+return Py_CompileStringFlags(str, p, s, NULL);
 }
 #undef PyRun_InteractiveOne
 PyAPI_FUNC(int)
 PyRun_InteractiveOne(FILE *f, const char *p)
 {
-	return PyRun_InteractiveOneFlags(f, p, NULL);
+return PyRun_InteractiveOneFlags(f, p, NULL);
 }
 #undef PyRun_InteractiveLoop
 PyAPI_FUNC(int)
 PyRun_InteractiveLoop(FILE *f, const char *p)
 {
-	return PyRun_InteractiveLoopFlags(f, p, NULL);
+return PyRun_InteractiveLoopFlags(f, p, NULL);
 }
 #ifdef __cplusplus
 }
 #endif

Mercurial > cpython-lru_cache-weakref

comparison Python/pythonrun.c @ 61463:fd25030223b0 legacy-trunk