@@ -472,6 +472,12 @@ def execsitecustomize():
         import sitecustomize
     except ImportError:
         pass
+    except Exception:
+        if sys.flags.verbose:
+            sys.excepthook(*sys.exc_info())
+        else:
+            print >>sys.stderr, \
+                "'import sitecustomize' failed; use -v for traceback"
 
 
 def execusercustomize():
@@ -480,6 +486,12 @@ def execusercustomize():
         import usercustomize
     except ImportError:
         pass
+    except Exception:
+        if sys.flags.verbose:
+            sys.excepthook(*sys.exc_info())
+        else:
+            print>>sys.stderr, \
+                "'import usercustomize' failed; use -v for traceback"
 
 
 def main():
 
@@ -569,10 +569,16 @@ Py_Main(int argc, char **argv)
 		}
 
 		if (sts==-1) {
-			sts = PyRun_AnyFileExFlags(
-				fp,
-				filename == NULL ? "<stdin>" : filename,
-				filename != NULL, &cf) != 0;
+			/* call pending calls like signal handlers (SIGINT) */
+			if (Py_MakePendingCalls() == -1) {
+				PyErr_Print();
+				sts = 1;
+			} else {
+				sts = PyRun_AnyFileExFlags(
+					fp,
+					filename == NULL ? "<stdin>" : filename,
+					filename != NULL, &cf) != 0;
+			}
 		}
 
 	}
 
@@ -764,8 +764,12 @@ tok_stdin_decode(struct tok_state *tok, char **inp)
 	return -1;
 
 error_clear:
-	/* Fallback to iso-8859-1: for backward compatibility */
 	Py_DECREF(enc);
+	if (!PyErr_ExceptionMatches(PyExc_UnicodeDecodeError)) {
+		tok->done = E_ERROR;
+		return -1;
+	}
+	/* Fallback to iso-8859-1: for backward compatibility */
 	PyErr_Clear();
 	return 0;
 }
 
@@ -2744,8 +2744,6 @@ PyImport_Import(PyObject *module_name)
 	}
 	else {
 		/* No globals -- use standard builtins, and fake globals */
-		PyErr_Clear();
-
 		builtins = PyImport_ImportModuleLevel("__builtin__",
 						      NULL, NULL, NULL, 0);
 		if (builtins == NULL)
 
@@ -245,14 +245,15 @@ Py_InitializeEx(int install_sigs)
 	}
 
 	initmain(); /* Module __main__ */
-	if (!Py_NoSiteFlag)
-		initsite(); /* Module site */
 
 	/* auto-thread-state API, if available */
 #ifdef WITH_THREAD
 	_PyGILState_Init(interp, tstate);
 #endif /* WITH_THREAD */
 
+	if (!Py_NoSiteFlag)
+		initsite(); /* Module site */
+
 	if ((p = Py_GETENV("PYTHONIOENCODING")) && *p != '\0') {
 		p = icodeset = codeset = strdup(p);
 		free_codeset = 1;
@@ -281,8 +282,13 @@ Py_InitializeEx(int install_sigs)
 				loc_codeset = strdup(loc_codeset);
 				Py_DECREF(enc);
 			} else {
-				loc_codeset = NULL;
-				PyErr_Clear();
+				if (PyErr_ExceptionMatches(PyExc_LookupError)) {
+					PyErr_Clear();
+					loc_codeset = NULL;
+				} else {
+					PyErr_Print();
+					exit(1);
+				}
 			}
 		} else
 			loc_codeset = NULL;
@@ -1543,6 +1549,8 @@ err_input(perrdetail *err)
 	char *msg = NULL;
 	errtype = PyExc_SyntaxError;
 	switch (err->error) {
+	case E_ERROR:
+		return;
 	case E_SYNTAX:
 		errtype = PyExc_IndentationError;
 		if (err->expected == INDENT)
Original file line number	Diff line number	Diff line change
`@@ -569,10 +569,16 @@ Py_Main(int argc, char **argv)`
`569`	`569`	`}`
`570`	`570`
`571`	`571`	`if (sts==-1) {`
`572`		`- sts = PyRun_AnyFileExFlags(`
`573`		`- fp,`
`574`		`- filename == NULL ? "<stdin>" : filename,`
`575`		`- filename != NULL, &cf) != 0;`
	`572`	`+ /* call pending calls like signal handlers (SIGINT) */`
	`573`	`+ if (Py_MakePendingCalls() == -1) {`
	`574`	`+ PyErr_Print();`
	`575`	`+ sts = 1;`
	`576`	`+ } else {`
	`577`	`+ sts = PyRun_AnyFileExFlags(`
	`578`	`+ fp,`
	`579`	`+ filename == NULL ? "<stdin>" : filename,`
	`580`	`+ filename != NULL, &cf) != 0;`
	`581`	`+ }`
`576`	`582`	`}`
`577`	`583`
`578`	`584`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2744,8 +2744,6 @@ PyImport_Import(PyObject *module_name)`
`2744`	`2744`	`}`
`2745`	`2745`	`else {`
`2746`	`2746`	`/* No globals -- use standard builtins, and fake globals */`
`2747`		`- PyErr_Clear();`
`2748`		`-`
`2749`	`2747`	`builtins = PyImport_ImportModuleLevel("__builtin__",`
`2750`	`2748`	`NULL, NULL, NULL, 0);`
`2751`	`2749`	`if (builtins == NULL)`