Merge branch 'master' into python-2.4

2025-08-04 01:09:52 +08:00 · 2019-05-08 08:57:59 -04:00
parent 325bba5be5 b05500dd49
commit f9bb0b0a46
4 changed files with 6 additions and 1 deletions
--- a/test/bytecode_3.6_run/01_fstring.pyc
+++ b/test/bytecode_3.6_run/01_fstring.pyc
--- a/test/bytecode_3.7_run/01_fstring.pyc
+++ b/test/bytecode_3.7_run/01_fstring.pyc
--- a/test/simple_source/bug36/01_fstring.py
+++ b/test/simple_source/bug36/01_fstring.py
@@ -38,3 +38,7 @@ filename = '.'
 source = 'foo'
 source = (f"__file__ = r'''{os.path.abspath(filename)}'''\n"
          + source + "\ndel __file__")
+
+# From 3.7.3 datalasses.py
+log_rounds  = 5
+assert "05$" == f'{log_rounds:02d}$'
--- a/uncompyle6/semantics/customize36.py
+++ b/uncompyle6/semantics/customize36.py
@@ -464,6 +464,7 @@ def customize_for_version36(self, version):
            elif subnode == 'fstring_single':
                f_conversion(subnode)
                data = self.traverse(subnode, indent='')
+                if data[0:1] == 'f':
                    data = strip_quotes(data[1:])
                result += data
                pass