🐛 Support await in expressions part of f-string

dflook · dflook · commit 819703c088f1 · 2020-10-03T13:36:53.000+01:00
diff --git a/src/python_minifier/expression_printer.py b/src/python_minifier/expression_printer.py
@@ -783,3 +783,9 @@ def visit_NamedExpr(self, node):
         self._expression(node.target)
         self.code += ':='
         self._expression(node.value)
+
+    def visit_Await(self, node):
+        assert isinstance(node, ast.Await)
+        self.token_break()
+        self.code += 'await'
+        self._rhs(node.value, node)
diff --git a/src/python_minifier/f_string.py b/src/python_minifier/f_string.py
@@ -47,14 +47,14 @@ def candidates(self):
                 if is_str(v):
                     try:
                         candidates = [x + self.str_for(v.s, quote) for x in candidates]
-                    except:
+                    except Exception as e:
                         continue
                 elif isinstance(v, ast.FormattedValue):
                     try:
                         candidates = [
                             x + y for x in candidates for y in FormattedValue(v, nested_allowed).get_candidates()
                         ]
-                    except:
+                    except Exception as e:
                         continue
                 else:
                     raise RuntimeError('Unexpected JoinedStr value')
diff --git a/src/python_minifier/module_printer.py b/src/python_minifier/module_printer.py
@@ -574,12 +574,6 @@ def visit_AsyncFunctionDef(self, node):
         assert isinstance(node, ast.AsyncFunctionDef)
         self.visit_FunctionDef(node, is_async=True)
 
-    def visit_Await(self, node):
-        assert isinstance(node, ast.Await)
-        self.token_break()
-        self.code += 'await'
-        self._rhs(node.value, node)
-
     def visit_AsyncFor(self, node):
         assert isinstance(node, ast.AsyncFor)
         self.visit_For(node, is_async=True)
diff --git a/test/test_await_fstring.py b/test/test_await_fstring.py
@@ -0,0 +1,17 @@
+import ast
+import sys
+import pytest
+from python_minifier import unparse
+from python_minifier.ast_compare import compare_ast
+
+def test_await_fstring():
+    if sys.version_info < (3, 6):
+        pytest.skip('No f-string expressions in python < 3.6')
+
+    source = '''
+f'{await 0}'
+'''
+
+    expected_ast = ast.parse(source)
+    actual_ast = unparse(expected_ast)
+    compare_ast(expected_ast, ast.parse(actual_ast))
