diff -r fafe20297927 Include/pythonrun.h
--- a/Include/pythonrun.h	Thu Nov 07 00:53:56 2013 +0100
+++ b/Include/pythonrun.h	Thu Nov 07 10:41:41 2013 +0100
@@ -54,11 +54,21 @@ PyAPI_FUNC(int) PyRun_AnyFileExFlags(
     const char *filename,       /* decoded from the filesystem encoding */
     int closeit,
     PyCompilerFlags *flags);
+PyAPI_FUNC(int) PyRun_AnyFileObject(
+    FILE *fp,
+    PyObject *filename,
+    int closeit,
+    PyCompilerFlags *flags);
 PyAPI_FUNC(int) PyRun_SimpleFileExFlags(
     FILE *fp,
     const char *filename,       /* decoded from the filesystem encoding */
     int closeit,
     PyCompilerFlags *flags);
+PyAPI_FUNC(int) PyRun_SimpleFileObject(
+    FILE *fp,
+    PyObject *filename,
+    int closeit,
+    PyCompilerFlags *flags);
 PyAPI_FUNC(int) PyRun_InteractiveOneFlags(
     FILE *fp,
     const char *filename,       /* decoded from the filesystem encoding */
@@ -71,6 +81,10 @@ PyAPI_FUNC(int) PyRun_InteractiveLoopFla
     FILE *fp,
     const char *filename,       /* decoded from the filesystem encoding */
     PyCompilerFlags *flags);
+PyAPI_FUNC(int) PyRun_InteractiveLoopObject(
+    FILE *fp,
+    PyObject *filename,
+    PyCompilerFlags *flags);
 
 PyAPI_FUNC(struct _mod *) PyParser_ASTFromString(
     const char *s,
@@ -132,6 +146,14 @@ PyAPI_FUNC(PyObject *) PyRun_FileExFlags
     PyObject *locals,
     int closeit,
     PyCompilerFlags *flags);
+PyAPI_FUNC(PyObject *) PyRun_FileObject(
+    FILE *fp,
+    PyObject *filename,
+    int start,
+    PyObject *globals,
+    PyObject *locals,
+    int closeit,
+    PyCompilerFlags *flags);
 #endif
 
 #ifdef Py_LIMITED_API
diff -r fafe20297927 Modules/main.c
--- a/Modules/main.c	Thu Nov 07 00:53:56 2013 +0100
+++ b/Modules/main.c	Thu Nov 07 10:41:41 2013 +0100
@@ -305,10 +305,9 @@ error:
 }
 
 static int
-run_file(FILE *fp, const wchar_t *filename, PyCompilerFlags *p_cf)
+run_file(FILE *fp, const wchar_t *filename_wstr, PyCompilerFlags *p_cf)
 {
-    PyObject *unicode, *bytes = NULL;
-    char *filename_str;
+    PyObject *filename, *bytes = NULL;
     int run;
 
     /* call pending calls like signal handlers (SIGINT) */
@@ -317,23 +316,16 @@ run_file(FILE *fp, const wchar_t *filena
         return 1;
     }
 
-    if (filename) {
-        unicode = PyUnicode_FromWideChar(filename, wcslen(filename));
-        if (unicode != NULL) {
-            bytes = PyUnicode_EncodeFSDefault(unicode);
-            Py_DECREF(unicode);
-        }
-        if (bytes != NULL)
-            filename_str = PyBytes_AsString(bytes);
-        else {
-            PyErr_Clear();
-            filename_str = "<encoding error>";
-        }
+    if (filename_wstr != NULL)
+        filename = PyUnicode_FromWideChar(filename_wstr, wcslen(filename_wstr));
+    else
+        filename = PyUnicode_FromString("<stdin>");
+    if (filename == NULL) {
+        PyErr_Print();
+        return 1;
     }
-    else
-        filename_str = "<stdin>";
 
-    run = PyRun_AnyFileExFlags(fp, filename_str, filename != NULL, p_cf);
+    run = PyRun_AnyFileObject(fp, filename, filename_wstr != NULL, p_cf);
     Py_XDECREF(bytes);
     return run != 0;
 }
diff -r fafe20297927 Python/pythonrun.c
--- a/Python/pythonrun.c	Thu Nov 07 00:53:56 2013 +0100
+++ b/Python/pythonrun.c	Thu Nov 07 10:41:41 2013 +0100
@@ -91,8 +91,7 @@ static int initstdio(void);
 static void flush_io(void);
 static PyObject *run_mod(mod_ty, PyObject *, PyObject *, PyObject *,
                           PyCompilerFlags *, PyArena *);
-static PyObject *run_pyc_file(FILE *, const char *, PyObject *, PyObject *,
-                              PyCompilerFlags *);
+static PyObject *run_pyc_file(FILE *, PyObject *, PyCompilerFlags *);
 static void err_input(perrdetail *);
 static void err_free(perrdetail *);
 static void initsigs(void);
@@ -106,6 +105,8 @@ extern int _PyLong_Init(void);
 extern void PyLong_Fini(void);
 extern int _PyFaulthandler_Init(void);
 extern void _PyFaulthandler_Fini(void);
+int _Py_FdIsInteractiveObject(FILE *fp, PyObject *filename);
+
 
 #ifdef WITH_THREAD
 extern void _PyGILState_Init(PyInterpreterState *, PyThreadState *);
@@ -1265,33 +1266,47 @@ initstdio(void)
 /* Parse input from a file and execute it */
 
 int
-PyRun_AnyFileExFlags(FILE *fp, const char *filename, int closeit,
-                     PyCompilerFlags *flags)
+PyRun_AnyFileObject(FILE *fp, PyObject *filename, int closeit,
+                    PyCompilerFlags *flags)
 {
-    if (filename == NULL)
-        filename = "???";
-    if (Py_FdIsInteractive(fp, filename)) {
-        int err = PyRun_InteractiveLoopFlags(fp, filename, flags);
+    assert(filename != NULL);
+    if (_Py_FdIsInteractiveObject(fp, filename)) {
+        int err = PyRun_InteractiveLoopObject(fp, filename, flags);
         if (closeit)
             fclose(fp);
         return err;
     }
     else
-        return PyRun_SimpleFileExFlags(fp, filename, closeit, flags);
+        return PyRun_SimpleFileObject(fp, filename, closeit, flags);
 }
 
 int
-PyRun_InteractiveLoopFlags(FILE *fp, const char *filename_str, PyCompilerFlags *flags)
+PyRun_AnyFileExFlags(FILE *fp, const char *filename_str, int closeit,
+                     PyCompilerFlags *flags)
 {
-    PyObject *filename, *v;
-    int ret, err;
-    PyCompilerFlags local_flags;
+    PyObject *filename;
+    int res;
+
+    if (filename_str == NULL)
+        filename_str = "???";
 
     filename = PyUnicode_DecodeFSDefault(filename_str);
     if (filename == NULL) {
         PyErr_Print();
         return -1;
     }
+    res = PyRun_AnyFileObject(fp, filename, closeit, flags);
+    Py_DECREF(filename);
+    return res;
+}
+
+int
+PyRun_InteractiveLoopObject(FILE *fp, PyObject *filename,
+                            PyCompilerFlags *flags)
+{
+    PyObject *v;
+    int ret, err;
+    PyCompilerFlags local_flags;
 
     if (flags == NULL) {
         flags = &local_flags;
@@ -1320,8 +1335,27 @@ PyRun_InteractiveLoopFlags(FILE *fp, con
             break;
         */
     }
+    return err;
+}
+
+int
+PyRun_InteractiveLoopFlags(FILE *fp, const char *filename_str,
+                           PyCompilerFlags *flags)
+{
+    PyObject *filename;
+    int res;
+
+    if (filename_str == NULL)
+        filename_str = "???";
+
+    filename = PyUnicode_DecodeFSDefault(filename_str);
+    if (filename == NULL) {
+        PyErr_Print();
+        return -1;
+    }
+    res = PyRun_InteractiveLoopObject(fp, filename, flags);
     Py_DECREF(filename);
-    return err;
+    return res;
 }
 
 /* compute parser flags based on compiler flags */
@@ -1457,14 +1491,58 @@ PyRun_InteractiveOneFlags(FILE *fp, cons
     return res;
 }
 
+/* filename.endswith(('.pyc', '.pyc')) */
+static int
+filename_endswith_pyc_pyo(PyObject *filename)
+{
+    void* data;
+    int kind;
+    Py_UCS4 ch;
+    Py_ssize_t len;
+
+    len = PyUnicode_GetLength(filename);
+    if (len < 4)
+        return 0;
+
+    data = PyUnicode_DATA(filename);
+    kind = PyUnicode_KIND(filename);
+
+    ch = PyUnicode_READ(kind, data, len-1);
+    if ((ch != 'c' && ch != 'o'))
+        return 0;
+
+    return (PyUnicode_READ(kind, data, len-2) == 'y'
+            && PyUnicode_READ(kind, data, len-3) == 'p'
+            && PyUnicode_READ(kind, data, len-4) == '.');
+}
+static int
+filename_endswith_pyo(PyObject *filename)
+{
+    void* data;
+    int kind;
+    Py_ssize_t len;
+
+    len = PyUnicode_GetLength(filename);
+    if (len < 4)
+        return 0;
+
+    data = PyUnicode_DATA(filename);
+    kind = PyUnicode_KIND(filename);
+
+    return (PyUnicode_READ(kind, data, len-2) == 'o'
+            && PyUnicode_READ(kind, data, len-2) == 'y'
+            && PyUnicode_READ(kind, data, len-3) == 'p'
+            && PyUnicode_READ(kind, data, len-4) == '.');
+}
+
 
 /* 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)
+maybe_pyc_file(FILE *fp, PyObject *filename, int closeit)
 {
-    if (strcmp(ext, ".pyc") == 0 || strcmp(ext, ".pyo") == 0)
+    if (filename_endswith_pyc_pyo(filename))
         return 1;
 
     /* Only look into the file if we are allowed to close it, since
@@ -1499,25 +1577,21 @@ maybe_pyc_file(FILE *fp, const char* fil
 }
 
 static int
-set_main_loader(PyObject *d, const char *filename, const char *loader_name)
+set_main_loader(PyObject *d, PyObject *filename, const char *loader_name)
 {
     PyInterpreterState *interp;
     PyThreadState *tstate;
-    PyObject *filename_obj, *loader_type, *loader;
+    PyObject *loader_type, *loader;
     int result = 0;
 
-    filename_obj = PyUnicode_DecodeFSDefault(filename);
-    if (filename_obj == NULL)
-        return -1;
     /* Get current thread state and interpreter pointer */
     tstate = PyThreadState_GET();
     interp = tstate->interp;
     loader_type = PyObject_GetAttrString(interp->importlib, loader_name);
     if (loader_type == NULL) {
-        Py_DECREF(filename_obj);
         return -1;
     }
-    loader = PyObject_CallFunction(loader_type, "sN", "__main__", filename_obj);
+    loader = PyObject_CallFunction(loader_type, "sO", "__main__", filename);
     Py_DECREF(loader_type);
     if (loader == NULL) {
         return -1;
@@ -1530,13 +1604,11 @@ set_main_loader(PyObject *d, const char 
 }
 
 int
-PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
-                        PyCompilerFlags *flags)
+PyRun_SimpleFileObject(FILE *fp, PyObject *filename, int closeit,
+                       PyCompilerFlags *flags)
 {
     PyObject *m, *d, *v;
-    const char *ext;
     int set_file_name = 0, ret = -1;
-    size_t len;
 
     m = PyImport_AddModule("__main__");
     if (m == NULL)
@@ -1544,34 +1616,23 @@ PyRun_SimpleFileExFlags(FILE *fp, const 
     Py_INCREF(m);
     d = PyModule_GetDict(m);
     if (PyDict_GetItemString(d, "__file__") == NULL) {
-        PyObject *f;
-        f = PyUnicode_DecodeFSDefault(filename);
-        if (f == NULL)
+        if (PyDict_SetItemString(d, "__file__", filename) < 0)
             goto done;
-        if (PyDict_SetItemString(d, "__file__", f) < 0) {
-            Py_DECREF(f);
+        if (PyDict_SetItemString(d, "__cached__", Py_None) < 0)
             goto done;
-        }
-        if (PyDict_SetItemString(d, "__cached__", Py_None) < 0) {
-            Py_DECREF(f);
-            goto done;
-        }
         set_file_name = 1;
-        Py_DECREF(f);
     }
-    len = strlen(filename);
-    ext = filename + len - (len > 4 ? 4 : 0);
-    if (maybe_pyc_file(fp, filename, ext, closeit)) {
+    if (maybe_pyc_file(fp, filename, closeit)) {
         FILE *pyc_fp;
         /* Try to run a pyc file. First, re-open in binary */
         if (closeit)
             fclose(fp);
-        if ((pyc_fp = _Py_fopen(filename, "rb")) == NULL) {
+        if ((pyc_fp = _Py_fopen_obj(filename, "rb")) == NULL) {
             fprintf(stderr, "python: Can't reopen .pyc file\n");
             goto done;
         }
         /* Turn on optimization if a .pyo file is given */
-        if (strcmp(ext, ".pyo") == 0)
+        if (filename_endswith_pyo(filename))
             Py_OptimizeFlag = 1;
 
         if (set_main_loader(d, filename, "SourcelessFileLoader") < 0) {
@@ -1580,18 +1641,18 @@ PyRun_SimpleFileExFlags(FILE *fp, const 
             fclose(pyc_fp);
             goto done;
         }
-        v = run_pyc_file(pyc_fp, filename, d, d, flags);
+        v = run_pyc_file(pyc_fp, d, flags);
         fclose(pyc_fp);
     } else {
         /* When running from stdin, leave __main__.__loader__ alone */
-        if (strcmp(filename, "<stdin>") != 0 &&
+        if (PyUnicode_CompareWithASCIIString(filename, "<stdin>") != 0 &&
             set_main_loader(d, filename, "SourceFileLoader") < 0) {
             fprintf(stderr, "python: failed to set __main__.__loader__\n");
             ret = -1;
             goto done;
         }
-        v = PyRun_FileExFlags(fp, filename, Py_file_input, d, d,
-                              closeit, flags);
+        v = PyRun_FileObject(fp, filename, Py_file_input, d, d,
+                             closeit, flags);
     }
     flush_io();
     if (v == NULL) {
@@ -1608,6 +1669,21 @@ PyRun_SimpleFileExFlags(FILE *fp, const 
 }
 
 int
+PyRun_SimpleFileExFlags(FILE *fp, const char *filename_str, int closeit,
+                        PyCompilerFlags *flags)
+{
+    PyObject *filename;
+    int res;
+
+    filename = PyUnicode_DecodeFSDefault(filename_str);
+    if (filename == NULL)
+        return -1;
+    res = PyRun_SimpleFileObject(fp, filename, closeit, flags);
+    Py_DECREF(filename);
+    return res;
+}
+
+int
 PyRun_SimpleStringFlags(const char *command, PyCompilerFlags *flags)
 {
     PyObject *m, *d, *v;
@@ -2080,17 +2156,12 @@ PyRun_StringFlags(const char *str, int s
 }
 
 PyObject *
-PyRun_FileExFlags(FILE *fp, const char *filename_str, int start, PyObject *globals,
-                  PyObject *locals, int closeit, PyCompilerFlags *flags)
+PyRun_FileObject(FILE *fp, PyObject *filename, int start, PyObject *globals,
+                 PyObject *locals, int closeit, PyCompilerFlags *flags)
 {
     PyObject *ret = NULL;
     mod_ty mod;
     PyArena *arena = NULL;
-    PyObject *filename;
-
-    filename = PyUnicode_DecodeFSDefault(filename_str);
-    if (filename == NULL)
-        goto exit;
 
     arena = PyArena_New();
     if (arena == NULL)
@@ -2106,12 +2177,27 @@ PyRun_FileExFlags(FILE *fp, const char *
     ret = run_mod(mod, filename, globals, locals, flags, arena);
 
 exit:
-    Py_XDECREF(filename);
     if (arena != NULL)
         PyArena_Free(arena);
     return ret;
 }
 
+PyObject *
+PyRun_FileExFlags(FILE *fp, const char *filename_str, int start,
+                  PyObject *globals, PyObject *locals, int closeit,
+                  PyCompilerFlags *flags)
+{
+    PyObject *filename, *res;
+
+    filename = PyUnicode_DecodeFSDefault(filename_str);
+    if (filename == NULL)
+        return NULL;
+    res = PyRun_FileObject(fp, filename, start, globals,
+                           locals, closeit, flags);
+    Py_DECREF(filename);
+    return res;
+}
+
 static void
 flush_io(void)
 {
@@ -2157,8 +2243,7 @@ run_mod(mod_ty mod, PyObject *filename, 
 }
 
 static PyObject *
-run_pyc_file(FILE *fp, const char *filename, PyObject *globals,
-             PyObject *locals, PyCompilerFlags *flags)
+run_pyc_file(FILE *fp, PyObject *globals, PyCompilerFlags *flags)
 {
     PyCodeObject *co;
     PyObject *v;
@@ -2182,7 +2267,7 @@ run_pyc_file(FILE *fp, const char *filen
         return NULL;
     }
     co = (PyCodeObject *)v;
-    v = PyEval_EvalCode((PyObject*)co, globals, locals);
+    v = PyEval_EvalCode((PyObject*)co, globals, globals);
     if (v && flags)
         flags->cf_flags |= (co->co_flags & PyCF_MASK);
     Py_DECREF(co);
@@ -2737,6 +2822,18 @@ Py_FdIsInteractive(FILE *fp, const char 
            (strcmp(filename, "???") == 0);
 }
 
+int
+_Py_FdIsInteractiveObject(FILE *fp, PyObject *filename)
+{
+    if (isatty((int)fileno(fp)))
+        return 1;
+    if (!Py_InteractiveFlag)
+        return 0;
+    return (filename == NULL) ||
+           (PyUnicode_CompareWithASCIIString(filename, "<stdin>") == 0) ||
+           (PyUnicode_CompareWithASCIIString(filename, "???") == 0);
+}
+
 
 #if defined(USE_STACKCHECK)
 #if defined(WIN32) && defined(_MSC_VER)