From 25160cdc4775a1ddb4e37c8bf5a6e31ad9c146ed Mon Sep 17 00:00:00 2001 From: Batuhan Taskaya Date: Sun, 17 May 2020 00:53:25 +0300 Subject: bpo-38870: Don't put unnecessary parentheses on class declarations in ast.parse (GH-20134) --- Lib/ast.py | 2 +- Lib/test/test_unparse.py | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Lib/ast.py b/Lib/ast.py index 1de37b9..d6cb334 100644 --- a/Lib/ast.py +++ b/Lib/ast.py @@ -930,7 +930,7 @@ class _Unparser(NodeVisitor): self.fill("@") self.traverse(deco) self.fill("class " + node.name) - with self.delimit("(", ")"): + with self.delimit_if("(", ")", condition = node.bases or node.keywords): comma = False for e in node.bases: if comma: diff --git a/Lib/test/test_unparse.py b/Lib/test/test_unparse.py index 1393bcc..410df7d 100644 --- a/Lib/test/test_unparse.py +++ b/Lib/test/test_unparse.py @@ -110,7 +110,7 @@ with f() as x, g() as y: docstring_prefixes = [ "", - "class foo():\n ", + "class foo:\n ", "def foo():\n ", "async def foo():\n ", ] @@ -367,6 +367,19 @@ class CosmeticTestCase(ASTTestCase): self.check_src_roundtrip("call((yield x))") self.check_src_roundtrip("return x + (yield x)") + + def test_class_bases_and_keywords(self): + self.check_src_roundtrip("class X:\n pass") + self.check_src_roundtrip("class X(A):\n pass") + self.check_src_roundtrip("class X(A, B, C, D):\n pass") + self.check_src_roundtrip("class X(x=y):\n pass") + self.check_src_roundtrip("class X(metaclass=z):\n pass") + self.check_src_roundtrip("class X(x=y, z=d):\n pass") + self.check_src_roundtrip("class X(A, x=y):\n pass") + self.check_src_roundtrip("class X(A, **kw):\n pass") + self.check_src_roundtrip("class X(*args):\n pass") + self.check_src_roundtrip("class X(*args, **kwargs):\n pass") + def test_docstrings(self): docstrings = ( '"""simple doc string"""', -- cgit v0.12