bpo-30167: Remove __cached__ from __main__ when removing __file__ (GH-7415)

bpo-30167: Remove cached from main when removing file (GH-7415)
82daa60d · INADA Naoki · GitHub · 9fbcfc08 · 82daa60d · 82daa60d
Commit 82daa60d authored Nov 29, 2018 by INADA Naoki Committed by GitHub Nov 29, 2018
Showing with 10 additions and 2 deletions

Misc/NEWS.d/next/Core and Builtins/2018-06-05-15-49-02.bpo-30167.e956hA.rst ...ore and Builtins/2018-06-05-15-49-02.bpo-30167.e956hA.rst +2 -0

Python/pythonrun.c Python/pythonrun.c +8 -2

No files found.
--- a/Misc/NEWS.d/next/Core and Builtins/2018-06-05-15-49-02.bpo-30167.e956hA.rst
+++ b/Misc/NEWS.d/next/Core and Builtins/2018-06-05-15-49-02.bpo-30167.e956hA.rst
+``PyRun_SimpleFileExFlags`` removes ``__cached__`` from module in addition
+to ``__file__``.
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -434,8 +434,14 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
    Py_DECREF(v);
    ret = 0;
  done:
-    if (set_file_name && PyDict_DelItemString(d, "__file__"))
+    if (set_file_name) {
-        PyErr_Clear();
+        if (PyDict_DelItemString(d, "__file__")) {
+            PyErr_Clear();
+        }
+        if (PyDict_DelItemString(d, "__cached__")) {
+            PyErr_Clear();
+        }
+    }
    Py_XDECREF(m);
    return ret;
 }