run pyupgrade to upgrade the codebase to python3.6

kitty/fonts/box_drawing.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# vim:fileencoding=utf-8
 # License: GPL v3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>
 
 #
@@ -372,7 +371,7 @@ def get_bezier_limits(bezier_x: ParameterizedFunc, bezier_y: ParameterizedFunc)
             if q > x:
                 increment /= 2
                 if increment < 1e-6:
-                    raise ValueError('Failed to find t for x={}'.format(x))
+                    raise ValueError(f'Failed to find t for x={x}')
             else:
                 start_t += increment
                 increment = t_limit - start_t
@@ -1096,7 +1095,7 @@ def test_drawing(sz: int = 48, family: str = 'monospace', start: int = 0x2500, n
             rgb_data = b''.join(rows)
             width *= 32
             height *= len(rows)
-            assert len(rgb_data) == width * height * 4, '{} != {}'.format(len(rgb_data), width * height * 4)
+            assert len(rgb_data) == width * height * 4, f'{len(rgb_data)} != {width * height * 4}'
             display_bitmap(rgb_data, width, height)
         finally:
             set_send_sprite_to_gpu(None)

kitty/fonts/core_text.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# vim:fileencoding=utf-8
 # License: GPL v3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>
 
 import re
@@ -82,7 +81,7 @@ def find_best_match(family: str, bold: bool = False, italic: bool = False, ignor
     # Let CoreText choose the font if the family exists, otherwise
     # fallback to Menlo
     if q not in font_map['family_map']:
-        log_error('The font {} was not found, falling back to Menlo'.format(family))
+        log_error(f'The font {family} was not found, falling back to Menlo')
         q = 'menlo'
     candidates = font_map['family_map'][q]
     return sorted(candidates, key=score)[-1]

kitty/fonts/fontconfig.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# vim:fileencoding=utf-8
 # License: GPL v3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
 
 import re
@@ -84,7 +83,7 @@ def find_font_features(postscript_name: str) -> Tuple[FontFeature, ...]:
         try:
             parsed = parse_font_feature(feat)
         except ValueError:
-            log_error('Ignoring invalid font feature: {}'.format(feat))
+            log_error(f'Ignoring invalid font feature: {feat}')
         else:
             features.append(FontFeature(feat, parsed))
 

kitty/fonts/list.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# vim:fileencoding=utf-8
 # License: GPL v3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>
 
 import sys

kitty/fonts/render.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# vim:fileencoding=utf-8
 # License: GPL v3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
 
 import ctypes