Skip to content

Commit

Permalink
Clean up backslash avoiding code in ast, fix typo (python#113605)
Browse files Browse the repository at this point in the history
As of python#108553, the `_avoid_backslashes` code path is dead

`scape_newlines` was introduced in python#110271. Happy to drop the typo fix
if we don't want it
  • Loading branch information
hauntsaninja committed Jan 16, 2024
1 parent 74208ed commit 3d5df54
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions Lib/ast.py
Original file line number Diff line number Diff line change
Expand Up @@ -728,12 +728,11 @@ class _Unparser(NodeVisitor):
output source code for the abstract syntax; original formatting
is disregarded."""

def __init__(self, *, _avoid_backslashes=False):
def __init__(self):
self._source = []
self._precedences = {}
self._type_ignores = {}
self._indent = 0
self._avoid_backslashes = _avoid_backslashes
self._in_try_star = False

def interleave(self, inter, f, seq):
Expand Down Expand Up @@ -1270,14 +1269,14 @@ def visit_JoinedStr(self, node):
quote_type = quote_types[0]
self.write(f"{quote_type}{value}{quote_type}")

def _write_fstring_inner(self, node, scape_newlines=False):
def _write_fstring_inner(self, node, escape_newlines=False):
if isinstance(node, JoinedStr):
# for both the f-string itself, and format_spec
for value in node.values:
self._write_fstring_inner(value, scape_newlines=scape_newlines)
self._write_fstring_inner(value, escape_newlines=escape_newlines)
elif isinstance(node, Constant) and isinstance(node.value, str):
value = node.value.replace("{", "{{").replace("}", "}}")
if scape_newlines:
if escape_newlines:
value = value.replace("\n", "\\n")
self.write(value)
elif isinstance(node, FormattedValue):
Expand All @@ -1303,7 +1302,7 @@ def unparse_inner(inner):
self.write(":")
self._write_fstring_inner(
node.format_spec,
scape_newlines=True
escape_newlines=True
)

def visit_Name(self, node):
Expand All @@ -1324,8 +1323,6 @@ def _write_constant(self, value):
.replace("inf", _INFSTR)
.replace("nan", f"({_INFSTR}-{_INFSTR})")
)
elif self._avoid_backslashes and isinstance(value, str):
self._write_str_avoiding_backslashes(value)
else:
self.write(repr(value))

Expand Down

0 comments on commit 3d5df54

Please sign in to comment.