fix throw / close propagate to subgenerator

isaiah · isaiah · commit 3a69400c4e6c · 2016-06-20T21:31:52.000+02:00
diff --git a/CPythonLib.includes b/CPythonLib.includes
@@ -188,3 +188,5 @@ wsgiref/*.py
 xdrlib.py
 xmllib.py
 xmlrpclib.py
+zipapp.py
+zipfile.py
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
@@ -266,6 +266,20 @@ def rmtree(path):
         if e.errno not in (errno.ENOENT, errno.ESRCH):
             raise
 
+def make_legacy_pyc(source):
+    """Move a PEP 3147/488 pyc file to its legacy pyc location.
+
+    :param source: The file system path to the source file.  The source file
+        does not need to exist, however the PEP 3147/488 pyc file must exist.
+    :return: The file system path to the legacy pyc file.
+    """
+    pyc_file = importlib.util.cache_from_source(source)
+    up_one = os.path.dirname(os.path.abspath(source))
+    legacy_pyc = os.path.join(up_one, source + 'c')
+    os.rename(pyc_file, legacy_pyc)
+    return legacy_pyc
+
+
 def forget(modname):
     '''"Forget" a module was ever imported by removing it from sys.modules and
     deleting any .pyc and .pyo files.'''
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
diff --git a/src/org/python/compiler/CodeCompiler.java b/src/org/python/compiler/CodeCompiler.java
@@ -707,6 +707,7 @@ public Object visitYieldFrom(YieldFrom node) throws Exception {
         code.label(restart);
         restoreLocals();
         restoreStack(stackState);
+
         loadFrame();
         code.getfield(p(PyFrame.class), "f_yieldfrom", ci(PyObject.class));
         code.invokestatic(p(Py.class), "yieldFrom", sig(PyObject.class, PyObject.class));
diff --git a/src/org/python/core/PyFrame.java b/src/org/python/core/PyFrame.java
@@ -6,6 +6,7 @@
 
 import org.python.expose.ExposedDelete;
 import org.python.expose.ExposedGet;
+import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
@@ -341,6 +342,16 @@ public void delglobal(String index) {
         }
     }
 
+    public PyObject clear() {
+        return frame_clear();
+    }
+
+    @ExposedMethod(doc = BuiltinDocs.frame_clear_doc)
+    final PyObject frame_clear() {
+        // XXX clean associated generator?
+        return Py.None;
+    }
+
     // nested scopes helpers
 
     public PyObject getclosure(int index) {
diff --git a/src/org/python/core/PyGenerator.java b/src/org/python/core/PyGenerator.java
@@ -114,8 +114,13 @@ private PyObject raiseException(PyException ex) {
             gi_frame = null;
             throw ex;
         }
-        gi_frame.setGeneratorInput(ex);
-        return next();
+        PyObject yf = gi_frame.f_yieldfrom;
+        if (yf != null) {
+            return ((PyGenerator) yf).raiseException(ex);
+        } else {
+            gi_frame.setGeneratorInput(ex);
+            return next();
+        }
     }
     
     @Override
@@ -161,15 +166,14 @@ private PyObject send_gen_exp(ThreadState state, PyObject value) {
         }
         gi_running = true;
         PyObject result = null;
-        PyObject yf = gi_frame.f_yieldfrom;
         try {
             result = gi_frame.f_code.call(state, gi_frame, closure);
         } catch (PyException pye) {
             if (!(pye.type == Py.StopIteration || pye.type == Py.GeneratorExit)) {
                 gi_frame = null;
                 throw pye;
             } else {
-                if (yf != null) {
+                if (gi_frame.f_yieldfrom != null) {
                     gi_frame.f_yieldfrom = null;
                     gi_frame.f_lasti++;
                     return __iternext__();
@@ -181,7 +185,7 @@ private PyObject send_gen_exp(ThreadState state, PyObject value) {
         } finally {
             gi_running = false;
         }
-        if (result == null && yf != null) {
+        if (result == null && gi_frame.f_yieldfrom != null) {
             gi_frame.f_yieldfrom = null;
             gi_frame.f_lasti++;
             return __iternext__();
