re-implement python export functionality using the type system

1 files changed, 6 insertions, 5 deletions

diff --git a/TurtleArt/tatype.py b/TurtleArt/tatype.py
index e6ffbb9..477e028 100644
--- a/TurtleArt/tatype.py
+++ b/TurtleArt/tatype.py
@@ -106,10 +106,11 @@ def get_type(x):
         else:
             return (get_type(value)[0], True)
     elif isinstance(x, ast.Call):
-        if x.func.__name__ in ('float', 'int'):
-            return (x.func.__name__, True)
-        elif x.func.__name__ in ('repr', 'str', 'unicode'):
-            return (TYPE_STRING, True)
+        if isinstance(x.func, ast.Name):
+            if x.func.id in ('float', 'int'):
+                return (x.func.__name__, True)
+            elif x.func.id in ('repr', 'str', 'unicode'):
+                return (TYPE_STRING, True)
 
     return (TYPE_OBJECT, isinstance(x, ast.AST))
 
@@ -317,7 +318,7 @@ def convert(x, new_type, old_type=None, converter=None):
                                 kwargs=None)
             else:
                 func_name = converter.__name__
-                return get_call_ast(func_name, y)
+                return get_call_ast(func_name, [y])
         else:
             return converter(y)