diff --git a/decompyle3/semantics/customize37.py b/decompyle3/semantics/customize37.py index 655382c1..8820e373 100644 --- a/decompyle3/semantics/customize37.py +++ b/decompyle3/semantics/customize37.py @@ -39,6 +39,7 @@ def escape_format(s): "dict", [Token("BUILD_MAP_0", attr=0, pattr="", offset=0, has_arg=True)] ) +# FIXME: Get this from a newer xdis! FSTRING_CONVERSION_MAP = {1: "!s", 2: "!r", 3: "!a", "X": ":X"} ####################### @@ -1190,7 +1191,7 @@ def n_call_ex_kw(node): if value == "": fmt = "%c(%p)" else: - fmt = "%c" + ("(%s, " % value).replace('%', '%%') + "%p)" + fmt = "%c" + ("(%s, " % value).replace("%", "%%") + "%p)" self.template_engine( (fmt, (0, "expr"), (2, "build_map_unpack_with_call", 100)), node @@ -1209,7 +1210,7 @@ def n_call_ex_kw2(node): if value == "": fmt = "%c(%p)" else: - fmt = "%c" + ("(%s, " % value).replace('%', '%%') + "%p)" + fmt = "%c" + ("(%s, " % value).replace("%", "%%") + "%p)" self.template_engine( (fmt, (0, "expr"), (2, "build_map_unpack_with_call", 100)), node