summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShantanu <12621235+hauntsaninja@users.noreply.github.com>2022-09-05 17:14:50 (GMT)
committerGitHub <noreply@github.com>2022-09-05 17:14:50 (GMT)
commit200c9a8da0e2b892c476807e986009c01327e781 (patch)
treef44c3b45c7e36e879a7f2bf6f613cfbdabc69936
parent2c7d2e8d46164efb6e27a64081d8e949f6876515 (diff)
downloadcpython-200c9a8da0e2b892c476807e986009c01327e781.zip
cpython-200c9a8da0e2b892c476807e986009c01327e781.tar.gz
cpython-200c9a8da0e2b892c476807e986009c01327e781.tar.bz2
gh-92986: Fix ast.unparse when ImportFrom.level is None (#92992)
This doesn't happen naturally, but is allowed by the ASDL and compiler. We don't want to change ASDL for backward compatibility reasons (#57645, #92987)
-rw-r--r--Lib/ast.py2
-rw-r--r--Lib/test/test_unparse.py6
-rw-r--r--Misc/NEWS.d/next/Library/2022-05-19-22-34-42.gh-issue-92986.e6uKxj.rst1
3 files changed, 8 insertions, 1 deletions
diff --git a/Lib/ast.py b/Lib/ast.py
index 8af6d1e..8adb61f 100644
--- a/Lib/ast.py
+++ b/Lib/ast.py
@@ -853,7 +853,7 @@ class _Unparser(NodeVisitor):
def visit_ImportFrom(self, node):
self.fill("from ")
- self.write("." * node.level)
+ self.write("." * (node.level or 0))
if node.module:
self.write(node.module)
self.write(" import ")
diff --git a/Lib/test/test_unparse.py b/Lib/test/test_unparse.py
index 969aa16..f1f1dd5 100644
--- a/Lib/test/test_unparse.py
+++ b/Lib/test/test_unparse.py
@@ -422,6 +422,12 @@ class UnparseTestCase(ASTTestCase):
def test_invalid_yield_from(self):
self.check_invalid(ast.YieldFrom(value=None))
+ def test_import_from_level_none(self):
+ tree = ast.ImportFrom(module='mod', names=[ast.alias(name='x')])
+ self.assertEqual(ast.unparse(tree), "from mod import x")
+ tree = ast.ImportFrom(module='mod', names=[ast.alias(name='x')], level=None)
+ self.assertEqual(ast.unparse(tree), "from mod import x")
+
def test_docstrings(self):
docstrings = (
'this ends with double quote"',
diff --git a/Misc/NEWS.d/next/Library/2022-05-19-22-34-42.gh-issue-92986.e6uKxj.rst b/Misc/NEWS.d/next/Library/2022-05-19-22-34-42.gh-issue-92986.e6uKxj.rst
new file mode 100644
index 0000000..691c0dd
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-05-19-22-34-42.gh-issue-92986.e6uKxj.rst
@@ -0,0 +1 @@
+Fix :func:`ast.unparse` when ``ImportFrom.level`` is None