jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-04 01:09:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

3.6+ nested format strings again

Browse Source
This commit is contained in:
rocky
2020-01-13 21:25:20 -05:00
parent ec3a9978fc
commit a918055a31
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_3.6_run/10_fstring.pyc
View File

Binary file not shown.

1
test/simple_source/bug36/10_fstring.py
View File

@@ -105,3 +105,4 @@ width, precision, value = (10, 4, decimal.Decimal('12.34567'))
assert f'result: {value:{width}.{precision}}' == 'result: 12.35' assert f'result: {value:{width}.{precision}}' == 'result: 12.35'
assert f'result: {value:{width:0}.{precision:1}}' == 'result: 12.35' assert f'result: {value:{width:0}.{precision:1}}' == 'result: 12.35'
assert f'{2}\t' == '2\t' assert f'{2}\t' == '2\t'
assert f'{f"{0}"*3}' == "000"

10
uncompyle6/semantics/customize36.py
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2019 by Rocky Bernstein # Copyright (c) 2019-2020 by Rocky Bernstein
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -451,13 +451,13 @@ def customize_for_version36(self, version):
expr = node[0] expr = node[0]
assert expr == "expr" assert expr == "expr"
conversion = f_conversion(node) conversion = f_conversion(node)
if (self.in_format_string): if (self.in_format_string and self.in_format_string != "formatted_value1"):
value = self.traverse(expr, indent="") value = self.traverse(expr, indent="")
es = escape_string("{%s%s}" % (value, conversion)) es = escape_string("{%s%s}" % (value, conversion))
f_str = "%s" % es f_str = "%s" % es
else: else:
old_in_format_string = self.in_format_string old_in_format_string = self.in_format_string
self.in_format_string = True self.in_format_string = "formatted_value1"
value = self.traverse(expr, indent="") value = self.traverse(expr, indent="")
self.in_format_string = old_in_format_string self.in_format_string = old_in_format_string
es = escape_string("{%s%s}" % (value, conversion)) es = escape_string("{%s%s}" % (value, conversion))
@@ -475,7 +475,7 @@ def customize_for_version36(self, version):
expr = node[0] expr = node[0]
assert expr == "expr" assert expr == "expr"
old_in_format_string = self.in_format_string old_in_format_string = self.in_format_string
self.in_format_string = True self.in_format_string = "formatted_value2"
value = self.traverse(expr, indent="") value = self.traverse(expr, indent="")
format_value_attr = node[-1] format_value_attr = node[-1]
assert format_value_attr == "FORMAT_VALUE_ATTR" assert format_value_attr == "FORMAT_VALUE_ATTR"
@@ -505,7 +505,7 @@ def customize_for_version36(self, version):
self.prec = 100 self.prec = 100
old_in_format_string = self.in_format_string old_in_format_string = self.in_format_string
self.in_format_string = True self.in_format_string = "joined_str"
result = "" result = ""
for expr in node[:-1]: for expr in node[:-1]:
assert expr == "expr" assert expr == "expr"

7
uncompyle6/semantics/pysource.py
View File

@@ -271,8 +271,11 @@ class SourceWalker(GenericASTTraversal, object):
self.tolerate_errors = tolerate_errors self.tolerate_errors = tolerate_errors
# If we are in a 3.6+ format string, we may need an # If we are in a 3.6+ format string, we may need an
# extra level of parens when seeing a lambda # extra level of parens when seeing a lambda. We also use
self.in_format_string = False # this to understand whether or not to add the "f" prefix.
# When not "None" it is a string of the last nonterminal
# that started the format string
self.in_format_string = None
# hide_internal suppresses displaying the additional instructions that sometimes # hide_internal suppresses displaying the additional instructions that sometimes
# exist in code but but were not written in the source code. # exist in code but but were not written in the source code.