AST conversion supports Python 3

nengo · Jun 6, 2016 · 6de4f06 · 6de4f06
1 parent 5f26441
commit 6de4f06
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/nengo_ocl/ast_conversion.py b/nengo_ocl/ast_conversion.py
@@ -409,10 +409,7 @@ def to_ocl(self, wrap=False):
                 raise NotImplementedError(
                     "'%s' function is not supported" % (fn.__name__))
 
-            try:
-                argcount = converter.func_code.co_argcount
-            except AttributeError:
-                argcount = converter.__code__.co_argcount
+            argcount = converter.__code__.co_argcount
             if argcount != len(args):
                 raise NotImplementedError(
                     "'%s' function is not supported for %d arguments"
@@ -845,7 +842,7 @@ def wrapper(x):  # need a wrapper to copy variables
         try:
             globals_dict = fn.func_globals
             closure_dict = (
-                dict(zip(fn.func_code.co_freevars,
+                dict(zip(fn.__code__.co_freevars,
                          [c.cell_contents for c in fn.func_closure]))
                 if fn.func_closure is not None else {})
         except AttributeError:

diff --git a/nengo_ocl/tests/test_ast_conversion.py b/nengo_ocl/tests/test_ast_conversion.py
@@ -241,7 +241,7 @@ def test_functions(Simulator, n_points=10):
 
     dfuncs = ast_conversion.direct_funcs
     ifuncs = ast_conversion.indirect_funcs
-    functions = dfuncs.keys() + ifuncs.keys()
+    functions = list(dfuncs.keys()) + list(ifuncs.keys())
     functions = [f for f in functions if f not in ignore]
     all_passed = True
     for fn in functions:
@@ -257,7 +257,7 @@ def wrapper(x):
                 lambda_fn = ifuncs[fn]
                 while lambda_fn.__name__ != '<lambda>':
                     lambda_fn = ifuncs[lambda_fn]
-                dims = lambda_fn.func_code.co_argcount
+                dims = lambda_fn.__code__.co_argcount
 
                 if dims == 1:
                     def wrapper(x):