Fix bugs, improve logic, allow returns in code

Author: penn5

meval/__init__.py

@@ -42,15 +42,19 @@ async def meval(code, globs, **kwargs):
     if not code:
         return None
 
-    for i in range(len(code)):
-        if isinstance(code[i], ast.Expr):
-            if i == len(code) - 1 or not isinstance(code[i].value, ast.Call):
-                code[i] = ast.copy_location(ast.Expr(ast.Call(func=ast.Attribute(value=ast.Name(id=ret_name,
-                                                                                                ctx=ast.Load()),
-                                                                                 attr="append", ctx=ast.Load()),
-                                                              args=[code[i].value], keywords=[])), code[-1])
-#    if isinstance(code[-1], ast.Expr):  # If we can use it as a lambda return (but multiline)
-#        code[-1] = ast.copy_location(ast.Return(code[-1].value), code[-1])  # Change it to a return statement
+    if not any(isinstance(node, ast.Return) for node in code):
+        for i in range(len(code)):
+            if isinstance(code[i], ast.Expr):
+                if i == len(code) - 1 or not isinstance(code[i].value, ast.Call):
+                    code[i] = ast.copy_location(ast.Expr(ast.Call(func=ast.Attribute(value=ast.Name(id=ret_name,
+                                                                                                    ctx=ast.Load()),
+                                                                                     attr="append", ctx=ast.Load()),
+                                                                  args=[code[i].value], keywords=[])), code[-1])
+    else:
+        for node in code:
+            if isinstance(node, ast.Return):
+                node.value = ast.List(elts=[node.value], ctx=ast.Load())
+
     code.append(ast.copy_location(ast.Return(value=ast.Name(id=ret_name, ctx=ast.Load())), code[-1]))
 
     # globals().update(**<global_args>)
@@ -70,8 +74,7 @@ async def meval(code, globs, **kwargs):
         args += [a]
     args = ast.arguments(args=[], vararg=None, kwonlyargs=args, kwarg=None, defaults=[],
                          kw_defaults=[None for i in range(len(args))])
-    if int.from_bytes(importlib.util.MAGIC_NUMBER[:-2], 'little') >= 3410:
-        args.posonlyargs = []
+    args.posonlyargs = []
     fun = ast.AsyncFunctionDef(name="tmp", args=args, body=code, decorator_list=[], returns=None)
     ast.fix_missing_locations(fun)
     mod = ast.parse("")
@@ -82,7 +85,7 @@ async def meval(code, globs, **kwargs):
 
     r = await locs["tmp"](**kwargs)
     for i in range(len(r)):
-        if isinstance(r[i], types.CoroutineType):
+        if hasattr(r[i], "__await__"):
             r[i] = await r[i]  # workaround for 3.5
     i = 0
     while i < len(r) - 1:
@@ -92,4 +95,6 @@ async def meval(code, globs, **kwargs):
             i += 1
     if len(r) == 1:
         [r] = r
+    elif not r:
+        r = None
     return r

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="meval",
-    version="2.4",
+    version="2.5",
     author="Hackintosh 5",
     author_email="hackintoshfive@gmail.com",
     description="Performs async evaluations of strings",