FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-43521: Allow ast.unparse with empty sets and NaN by Kodiologist · Pull Request #24897 · python/cpython · GitHub

/ cpython Public

bpo-43521: Allow ast.unparse with empty sets and NaN #24897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 1 commit into from
Mar 18, 2021
Conversation 21 Commits 1 Checks 0 Files changed
Merged

bpo-43521: Allow ast.unparse with empty sets and NaN #24897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .py  (2) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
20 changes: 14 additions & 6 deletions Lib/ast.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1199,8 +1199,13 @@ def _write_docstring(self, node):

def _write_constant(self, value):
if isinstance(value, (float, complex)):
# Substitute overflowing decimal literal for AST infinities.
self.write(repr(value).replace("inf", _INFSTR))
# Substitute overflowing decimal literal for AST infinities,
# and inf - inf for NaNs.
self.write(
repr(value)
.replace("inf", _INFSTR)
.replace("nan", f"({_INFSTR}-{_INFSTR})")
)
elif self._avoid_backslashes and isinstance(value, str):
self._write_str_avoiding_backslashes(value)
else:
Expand Down Expand Up @@ -1273,10 +1278,13 @@ def visit_IfExp(self, node):
self.traverse(node.orelse)

def visit_Set(self, node):
if not node.elts:
raise ValueError("Set node should have at least one item")
with self.delimit("{", "}"):
self.interleave(lambda: self.write(", "), self.traverse, node.elts)
if node.elts:
with self.delimit("{", "}"):
self.interleave(lambda: self.write(", "), self.traverse, node.elts)
else:
# `{}` would be interpreted as a dictionary literal, and
# `set` might be shadowed. Thus:
self.write('{*()}')

def visit_Dict(self, node):
def write_key_value_pair(k, v):
Expand Down
15 changes: 12 additions & 3 deletions Lib/test/test_unparse.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,12 @@ def test_huge_float(self):
self.check_ast_roundtrip("1e1000j")
self.check_ast_roundtrip("-1e1000j")

def test_nan(self):
self.assertASTEqual(
ast.parse(ast.unparse(ast.Constant(value=float('nan')))),
ast.parse('1e1000 - 1e1000')
)

def test_min_int(self):
self.check_ast_roundtrip(str(-(2 ** 31)))
self.check_ast_roundtrip(str(-(2 ** 63)))
Expand Down Expand Up @@ -252,6 +258,12 @@ def test_annotations(self):
def test_set_literal(self):
self.check_ast_roundtrip("{'a', 'b', 'c'}")

def test_empty_set(self):
self.assertASTEqual(
ast.parse(ast.unparse(ast.Set(elts=[]))),
ast.parse('{*()}')
)

def test_set_comprehension(self):
self.check_ast_roundtrip("{x for x in range(5)}")

Expand Down Expand Up @@ -326,9 +338,6 @@ def test_invalid_fstring_conversion(self):
def test_invalid_fstring_backslash(self):
self.check_invalid(ast.FormattedValue(value=ast.Constant(value="\\\\")))

def test_invalid_set(self):
self.check_invalid(ast.Set(elts=[]))

def test_invalid_yield_from(self):
self.check_invalid(ast.YieldFrom(value=None))

Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2021-03-16-16-05-02.bpo-43521.mRT6fh.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
``ast.unparse`` can now render NaNs and empty sets.
Back | FazBrowse Home | New Git URL