Fix some shallow bugs in Demo/parser/unparse.py, and add tests:

  - insert commas between entries in del statement
  - left and right shifts were represented as >> and << (respectively); reverse
  - unindent properly after for: else:  or while: else:
  - add parens around the result of an unary operation
  - add parens around negative numbers, to avoid turning (-1)**2 into -1**2.

2 files changed, 77 insertions, 6 deletions

diff --git a/Demo/parser/test_unparse.py b/Demo/parser/test_unparse.py
new file mode 100644
index 0000000..bf68c1a
--- /dev/null
+++ b/Demo/parser/test_unparse.py
@@ -0,0 +1,61 @@
+import unittest
+from test import test_support
+
+import cStringIO
+import ast
+import _ast
+import unparse
+
+forelse = """\
+def f():
+    for x in range(10):
+        break
+    else:
+        y = 2
+    z = 3
+"""
+
+whileelse = """\
+def g():
+    while True:
+        break
+    else:
+        y = 2
+    z = 3
+"""
+
+class UnparseTestCase(unittest.TestCase):
+    # Tests for specific bugs found in earlier versions of unparse
+
+    def check_roundtrip(self, code1, filename="internal"):
+        ast1 = compile(code1, filename, "exec", _ast.PyCF_ONLY_AST)
+        unparse_buffer = cStringIO.StringIO()
+        unparse.Unparser(ast1, unparse_buffer)
+        code2 = unparse_buffer.getvalue()
+        ast2 = compile(code2, filename, "exec", _ast.PyCF_ONLY_AST)
+        self.assertEqual(ast.dump(ast1), ast.dump(ast2))
+
+    def test_del_statement(self):
+        self.check_roundtrip("del x, y, z")
+
+    def test_shifts(self):
+        self.check_roundtrip("45 << 2")
+        self.check_roundtrip("13 >> 7")
+
+    def test_for_else(self):
+        self.check_roundtrip(forelse)
+
+    def test_while_else(self):
+        self.check_roundtrip(forelse)
+
+    def test_unary_parens(self):
+        self.check_roundtrip("(-1)**7")
+        self.check_roundtrip("not True or False")
+        self.check_roundtrip("True or not False")
+
+
+def test_main():
+    test_support.run_unittest(UnparseTestCase)
+
+if __name__ == '__main__':
+    test_main()
diff --git a/Demo/parser/unparse.py b/Demo/parser/unparse.py
index bfb8a09..d48ddd1 100644
--- a/Demo/parser/unparse.py
+++ b/Demo/parser/unparse.py
@@ -115,7 +115,7 @@ class Unparser:
 
     def _Delete(self, t):
         self.fill("del ")
-        self.dispatch(t.targets)
+        interleave(lambda: self.write(", "), self.dispatch, t.targets)
 
     def _Assert(self, t):
         self.fill("assert ")
@@ -245,7 +245,7 @@ class Unparser:
             self.fill("else")
             self.enter()
             self.dispatch(t.orelse)
-            self.leave
+            self.leave()
 
     def _If(self, t):
         self.fill("if ")
@@ -270,7 +270,7 @@ class Unparser:
             self.fill("else")
             self.enter()
             self.dispatch(t.orelse)
-            self.leave
+            self.leave()
 
     def _With(self, t):
         self.fill("with ")
@@ -295,7 +295,16 @@ class Unparser:
         self.write("`")
 
     def _Num(self, t):
-        self.write(repr(t.n))
+        # There are no negative numeric literals in Python; however,
+        # some optimizations produce a negative Num in the AST. Add
+        # parentheses to avoid turning (-1)**2 into -1**2.
+        strnum = repr(t.n)
+        if strnum.startswith("-"):
+            self.write("(")
+            self.write(strnum)
+            self.write(")")
+        else:
+            self.write(repr(t.n))
 
     def _List(self, t):
         self.write("[")
@@ -355,13 +364,14 @@ class Unparser:
 
     unop = {"Invert":"~", "Not": "not", "UAdd":"+", "USub":"-"}
     def _UnaryOp(self, t):
-        self.write(self.unop[t.op.__class__.__name__])
         self.write("(")
+        self.write(self.unop[t.op.__class__.__name__])
+        self.write(" ")
         self.dispatch(t.operand)
         self.write(")")
 
     binop = { "Add":"+", "Sub":"-", "Mult":"*", "Div":"/", "Mod":"%",
-                    "LShift":">>", "RShift":"<<", "BitOr":"|", "BitXor":"^", "BitAnd":"&",
+                    "LShift":"<<", "RShift":">>", "BitOr":"|", "BitXor":"^", "BitAnd":"&",
                     "FloorDiv":"//", "Pow": "**"}
     def _BinOp(self, t):
         self.write("(")