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

Fix some fstring formats bugs...

Browse Source 
* Need parens around a lambda in an format string.
* handle format string specifier + width

Note: other format-string bugs remain.
This commit is contained in:
rocky
2020-01-13 06:40:18 -05:00
parent f56ad56021
commit de282af05d
7 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
uncompyle6/semantics/customize36.py
View File

@@ -449,8 +449,10 @@ def customize_for_version36(self, version):
def n_formatted_value1(node):
expr = node[0]
assert expr == 'expr'
value = self.traverse(expr, indent='')
assert expr == "expr"
self.in_format_string = True
value = self.traverse(expr, indent="")
self.in_format_string = False
conversion = f_conversion(node)
f_str = "f%s" % escape_string("{%s%s}" % (value, conversion))
self.write(f_str)
@@ -463,23 +465,30 @@ def customize_for_version36(self, version):
self.prec = 100
expr = node[0]
assert expr == 'expr'
value = self.traverse(expr, indent='')
assert expr == "expr"
self.in_format_string = True
value = self.traverse(expr, indent="")
self.in_format_string = False
format_value_attr = node[-1]
assert format_value_attr == 'FORMAT_VALUE_ATTR'
assert format_value_attr == "FORMAT_VALUE_ATTR"
attr = format_value_attr.attr
if attr == 4:
assert node[1] == 'expr'
fmt = strip_quotes(self.traverse(node[1], indent=''))
conversion = ":%s" % fmt
if attr & 4:
assert node[1] == "expr"
fmt = strip_quotes(self.traverse(node[1], indent=""))
attr_flags = attr & 3
if attr_flags:
conversion = "%s:%s" % (FSTRING_CONVERSION_MAP.get(attr_flags, ""), fmt)
else:
conversion = ":%s" % fmt
else:
conversion = FSTRING_CONVERSION_MAP.get(attr, '')
conversion = FSTRING_CONVERSION_MAP.get(attr, "")
f_str = "f%s" % escape_string("{%s%s}" % (value, conversion))
self.write(f_str)
self.prec = p
self.prune()
self.n_formatted_value2 = n_formatted_value2
def n_joined_str(node):