bpo-39889: Fix ast.unparse() for subscript. (GH-18824)

1 files changed, 17 insertions, 2 deletions

diff --git a/Lib/ast.py b/Lib/ast.py
index 93ffa1edc8..2719f6ff7a 100644
--- a/Lib/ast.py
+++ b/Lib/ast.py
@@ -1261,7 +1261,17 @@ class _Unparser(NodeVisitor):
         self.set_precedence(_Precedence.ATOM, node.value)
         self.traverse(node.value)
         with self.delimit("[", "]"):
-            self.traverse(node.slice)
+            if (isinstance(node.slice, Index)
+                    and isinstance(node.slice.value, Tuple)
+                    and node.slice.value.elts):
+                if len(node.slice.value.elts) == 1:
+                    elt = node.slice.value.elts[0]
+                    self.traverse(elt)
+                    self.write(",")
+                else:
+                    self.interleave(lambda: self.write(", "), self.traverse, node.slice.value.elts)
+            else:
+                self.traverse(node.slice)
 
     def visit_Starred(self, node):
         self.write("*")
@@ -1286,7 +1296,12 @@ class _Unparser(NodeVisitor):
             self.traverse(node.step)
 
     def visit_ExtSlice(self, node):
-        self.interleave(lambda: self.write(", "), self.traverse, node.dims)
+        if len(node.dims) == 1:
+            elt = node.dims[0]
+            self.traverse(elt)
+            self.write(",")
+        else:
+            self.interleave(lambda: self.write(", "), self.traverse, node.dims)
 
     def visit_arg(self, node):
         self.write(node.arg)