lispy-python.py (print_elisp): Improve and add test

Author: abo-abo

lispy-python.py

@@ -195,6 +195,9 @@ def format_arg(arg_pair: Tuple[str, Optional[str]]) -> str:
 
 def print_elisp(obj: Any, end: str = "\n") -> None:
     if hasattr(obj, "_asdict") and obj._asdict is not None:
+        if hasattr(type(obj), "__repr__"):
+            print('"' + str(obj).replace('"', '') + '"')
+            return
         # namedtuple
         try:
             print_elisp(obj._asdict(), end)
@@ -230,14 +233,14 @@ def print_elisp(obj: Any, end: str = "\n") -> None:
         print_elisp(list(obj))
     elif isinstance(obj, int):
         print(obj)
+    elif isinstance(obj, list) or isinstance(obj, tuple):
+        print("(", end="")
+        for x in obj:
+            print_elisp(x)
+        print(")")
     else:
         if obj is not None:
-            if type(obj) is list or type(obj) is tuple:
-                print("(", end="")
-                for x in obj:
-                    print_elisp(x)
-                print(")")
-            elif type(obj) is str:
+            if type(obj) is str:
                 # quote strings?
                 # print("\"'" + re.sub("\"", "\\\"", obj) + "'\"", end=" ")
                 print('"' + re.sub("\"", "\\\"", obj) + '"', end=" ")

test/test_lispy-python.py

@@ -1,5 +1,6 @@
 import io
 import os
+import re
 import ast
 import sys
 from importlib.machinery import SourceFileLoader
@@ -8,6 +9,12 @@
 
 lp = SourceFileLoader("lispy-python", os.path.dirname(__file__) + "/../lispy-python.py").load_module()
 
+def print_elisp_to_str(obj):
+    with io.StringIO() as buf, redirect_stdout(buf):
+        lp.print_elisp(obj)
+        return buf.getvalue().strip()
+
+
 def with_output_to_string(code):
     with io.StringIO() as buf, redirect_stdout(buf):
         exec(code)
@@ -206,3 +213,14 @@ def square(x):
     assert r["out"] == '(3\n4\n5\n)'
     assert lp.select_item(code, 0) == 3
     assert lp.select_item(code, 1) == 4
+
+def test_eval_syntax_error():
+    r = lp.eval_code("[[]", {})
+    assert "SyntaxError" in r["err"]
+
+def test_print_elisp():
+    class Obj(object):
+        pass
+    arr = [Obj()]
+    r = print_elisp_to_str(arr)
+    assert re.match('\\("<.*Obj object at 0x[0-9a-f]+>" \\)', r)