Replace format with f-strings.

Author: andialbrecht

sqlparse/cli.py

@@ -60,15 +60,15 @@ def create_parser():
         dest='keyword_case',
         choices=_CASE_CHOICES,
         help='change case of keywords, CHOICE is one of {}'.format(
-            ', '.join('"{}"'.format(x) for x in _CASE_CHOICES)))
+            ', '.join(f'"{x}"' for x in _CASE_CHOICES)))
 
     group.add_argument(
         '-i', '--identifiers',
         metavar='CHOICE',
         dest='identifier_case',
         choices=_CASE_CHOICES,
         help='change case of identifiers, CHOICE is one of {}'.format(
-            ', '.join('"{}"'.format(x) for x in _CASE_CHOICES)))
+            ', '.join(f'"{x}"' for x in _CASE_CHOICES)))
 
     group.add_argument(
         '-l', '--language',
@@ -157,7 +157,7 @@ def create_parser():
 
 def _error(msg):
     """Print msg and optionally exit with return code exit_."""
-    sys.stderr.write('[ERROR] {}\n'.format(msg))
+    sys.stderr.write(f'[ERROR] {msg}\n')
     return 1
 
 
@@ -177,23 +177,23 @@ def main(args=None):
                 data = ''.join(f.readlines())
         except OSError as e:
             return _error(
-                'Failed to read {}: {}'.format(args.filename, e))
+                f'Failed to read {args.filename}: {e}')
 
     close_stream = False
     if args.outfile:
         try:
             stream = open(args.outfile, 'w', encoding=args.encoding)
             close_stream = True
         except OSError as e:
-            return _error('Failed to open {}: {}'.format(args.outfile, e))
+            return _error(f'Failed to open {args.outfile}: {e}')
     else:
         stream = sys.stdout
 
     formatter_opts = vars(args)
     try:
         formatter_opts = sqlparse.formatter.validate_options(formatter_opts)
     except SQLParseError as e:
-        return _error('Invalid options: {}'.format(e))
+        return _error(f'Invalid options: {e}')
 
     s = sqlparse.format(data, **formatter_opts)
     stream.write(s)

sqlparse/filters/aligned_indent.py

@@ -126,7 +126,7 @@ def _process_default(self, tlist):
                 self._process(sgroup)
 
     def _process(self, tlist):
-        func_name = '_process_{cls}'.format(cls=type(tlist).__name__)
+        func_name = f'_process_{type(tlist).__name__}'
         func = getattr(self, func_name.lower(), self._process_default)
         func(tlist)
 

sqlparse/filters/others.py

@@ -81,7 +81,7 @@ def process(self, stmt):
 
 class StripWhitespaceFilter:
     def _stripws(self, tlist):
-        func_name = '_stripws_{cls}'.format(cls=type(tlist).__name__)
+        func_name = f'_stripws_{type(tlist).__name__}'
         func = getattr(self, func_name.lower(), self._stripws_default)
         func(tlist)
 

sqlparse/filters/reindent.py

@@ -97,7 +97,7 @@ def _split_statements(self, tlist):
             tidx, token = tlist.token_next_by(t=ttypes, idx=tidx)
 
     def _process(self, tlist):
-        func_name = '_process_{cls}'.format(cls=type(tlist).__name__)
+        func_name = f'_process_{type(tlist).__name__}'
         func = getattr(self, func_name.lower(), self._process_default)
         func(tlist)
 

sqlparse/filters/right_margin.py

@@ -37,7 +37,7 @@ def _process(self, group, stream):
                         indent = match.group()
                     else:
                         indent = ''
-                    yield sql.Token(T.Whitespace, '\n{}'.format(indent))
+                    yield sql.Token(T.Whitespace, f'\n{indent}')
                     self.line = indent
                 self.line += val
             yield token

sqlparse/sql.py

@@ -189,8 +189,8 @@ def _pprint_tree(self, max_depth=None, depth=0, f=None, _pre=''):
             pre = '`- ' if last else '|- '
 
             q = '"' if value.startswith("'") and value.endswith("'") else "'"
-            print("{_pre}{pre}{idx} {cls} {q}{value}{q}"
-                  .format(**locals()), file=f)
+            print(f"{_pre}{pre}{idx} {cls} {q}{value}{q}"
+                  , file=f)
 
             if token.is_group and (max_depth is None or depth < max_depth):
                 parent_pre = '   ' if last else '|  '

tests/test_grouping.py

@@ -506,7 +506,7 @@ def test_comparison_with_parenthesis():
 ))
 def test_comparison_with_strings(operator):
     # issue148
-    p = sqlparse.parse("foo {} 'bar'".format(operator))[0]
+    p = sqlparse.parse(f"foo {operator} 'bar'")[0]
     assert len(p.tokens) == 1
     assert isinstance(p.tokens[0], sql.Comparison)
     assert p.tokens[0].right.value == "'bar'"
@@ -585,7 +585,7 @@ def test_comparison_with_typed_literal():
 
 @pytest.mark.parametrize('start', ['FOR', 'FOREACH'])
 def test_forloops(start):
-    p = sqlparse.parse('{} foo in bar LOOP foobar END LOOP'.format(start))[0]
+    p = sqlparse.parse(f'{start} foo in bar LOOP foobar END LOOP')[0]
     assert (len(p.tokens)) == 1
     assert isinstance(p.tokens[0], sql.For)
 

tests/test_regressions.py

@@ -159,9 +159,9 @@ def test_parse_sql_with_binary():
     # See https://github.com/andialbrecht/sqlparse/pull/88
     # digest = '‚|ËêŠplL4¡h‘øN{'
     digest = '\x82|\xcb\x0e\xea\x8aplL4\xa1h\x91\xf8N{'
-    sql = "select * from foo where bar = '{}'".format(digest)
+    sql = f"select * from foo where bar = '{digest}'"
     formatted = sqlparse.format(sql, reindent=True)
-    tformatted = "select *\nfrom foo\nwhere bar = '{}'".format(digest)
+    tformatted = f"select *\nfrom foo\nwhere bar = '{digest}'"
     assert formatted == tformatted
 
 
@@ -336,9 +336,9 @@ def test_issue315_utf8_by_default():
         '\x9b\xb2.'
         '\xec\x82\xac\xeb\x9e\x91\xed\x95\xb4\xec\x9a\x94'
     )
-    sql = "select * from foo where bar = '{}'".format(digest)
+    sql = f"select * from foo where bar = '{digest}'"
     formatted = sqlparse.format(sql, reindent=True)
-    tformatted = "select *\nfrom foo\nwhere bar = '{}'".format(digest)
+    tformatted = f"select *\nfrom foo\nwhere bar = '{digest}'"
     assert formatted == tformatted
 
 

tests/test_tokenize.py

@@ -150,7 +150,7 @@ def test_stream_error():
     'INNER JOIN',
     'LEFT INNER JOIN'])
 def test_parse_join(expr):
-    p = sqlparse.parse('{} foo'.format(expr))[0]
+    p = sqlparse.parse(f'{expr} foo')[0]
     assert len(p.tokens) == 3
     assert p.tokens[0].ttype is T.Keyword