Add Py3.4 support.

byterun/pyobj.py

@@ -2,6 +2,7 @@
 
 import collections
 import inspect
+import re
 import types
 
 import six
@@ -23,7 +24,7 @@ def make_cell(value):
 class Function(object):
     __slots__ = [
         'func_code', 'func_name', 'func_defaults', 'func_globals',
-        'func_locals', 'func_dict', 'func_closure',
+        'func_dict', 'func_closure',
         '__name__', '__dict__', '__doc__',
         '_vm', '_func',
     ]
@@ -34,7 +35,6 @@ def __init__(self, name, code, globs, defaults, closure, vm):
         self.func_name = self.__name__ = name or code.co_name
         self.func_defaults = tuple(defaults)
         self.func_globals = globs
-        self.func_locals = self._vm.frame.f_locals
         self.__dict__ = {}
         self.func_closure = closure
         self.__doc__ = code.co_consts[0] if code.co_consts else None
@@ -61,11 +61,12 @@ def __get__(self, instance, owner):
             return self
 
     def __call__(self, *args, **kwargs):
-        if PY2 and self.func_name in ["<setcomp>", "<dictcomp>", "<genexpr>"]:
+        if re.search(r'<(?:listcomp|setcomp|dictcomp|genexpr)>$', self.func_name):
             # D'oh! http://bugs.python.org/issue19611 Py2 doesn't know how to
             # inspect set comprehensions, dict comprehensions, or generator
             # expressions properly.  They are always functions of one argument,
-            # so just do the right thing.
+            # so just do the right thing.  Py3.4 also would fail without this
+            # hack, for list comprehensions too. (Haven't checked for other 3.x.)
             assert len(args) == 1 and not kwargs, "Surprising comprehension!"
             callargs = {".0": args[0]}
         else:

byterun/pyvm2.py

@@ -421,7 +421,10 @@ def byte_LOAD_GLOBAL(self, name):
         elif name in f.f_builtins:
             val = f.f_builtins[name]
         else:
-            raise NameError("global name '%s' is not defined" % name)
+            if PY2:
+                raise NameError("global name '%s' is not defined" % name)
+            elif PY3:
+                raise NameError("name '%s' is not defined" % name)
         self.push(val)
 
     def byte_LOAD_DEREF(self, name):
@@ -1029,11 +1032,30 @@ def byte_BUILD_CLASS(self):
     elif PY3:
         def byte_LOAD_BUILD_CLASS(self):
             # New in py3
-            self.push(__build_class__)
+            self.push(build_class)
 
         def byte_STORE_LOCALS(self):
             self.frame.f_locals = self.pop()
 
     if 0:   # Not in py2.7
         def byte_SET_LINENO(self, lineno):
             self.frame.f_lineno = lineno
+
+if PY3:
+    def build_class(func, name, *bases, **kwds):
+        "Simplified (i.e., wrong) version of __build_class__."
+        assert isinstance(func, Function)
+        assert isinstance(name, str)
+        # This is simplified in that we don't yet handle metaclasses. So we do
+        # make sure there is no metaclass, before proceeding.
+        assert not kwds # No explicit metaclass or keyword arguments to the metaclass.
+        for base in bases:
+            assert type(base) == type # No implicit metaclass from the bases.
+        # OK, no metaclass; we may proceed.
+        # XXX What about func.func_closure? vm.make_frame() gives us no way to pass it in.
+        # We'll come back to fix this; for now, just make sure this case doesn't come up.
+        assert not func.func_closure
+        ns = {}
+        frame = func._vm.make_frame(func.func_code, f_globals=func.func_globals, f_locals=ns)
+        func._vm.run_frame(frame)
+        return type(name, bases, ns)

tests/test_functions.py

@@ -207,6 +207,18 @@ def f4(g):
             assert answer == 54
             """)
 
+    def test_closure_vars_from_static_parent(self):
+        self.assert_ok("""\
+            def f(xs):
+                return lambda: xs[0]
+
+            def g(h):
+                xs = 5
+                lambda: xs
+                return h()
+
+            assert g(f([42])) == 42
+            """)
 
 class TestGenerators(vmtest.VmTestCase):
     def test_first(self):

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py33
+envlist = py27, py33, py34
 
 [testenv]
 commands =