run pyupgrade to upgrade the codebase to python3.6

kitty_tests/__init__.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 os
@@ -83,7 +82,7 @@ def filled_line_buf(ynum=5, xnum=5, cursor=Cursor()):
     ans = LineBuf(ynum, xnum)
     cursor.x = 0
     for i in range(ynum):
-        t = ('{}'.format(i)) * xnum
+        t = (f'{i}') * xnum
         ans.line(i).set_text(t, 0, xnum, cursor)
     return ans
 

kitty_tests/bench_scrollback.py

@@ -28,7 +28,7 @@ def main():
         characters += ['\x1b[91m', '\x1b[0m', '\x1b[1;32m', '\x1b[22m', '\x1b[35m']
 
     if args.unicode:
-        characters += [u'日', u'本', u'💜', u'☃', u'🎩', u'🍀', u'、']
+        characters += ['日', '本', '💜', '☃', '🎩', '🍀', '、']
 
     patterns = []
     for _ in range(0, args.patterns):

kitty_tests/check_build.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim:fileencoding=utf-8
 # License: GPLv3 Copyright: 2021, Kovid Goyal <kovid at kovidgoyal.net>
 
 

kitty_tests/choose.py

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

kitty_tests/datatypes.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 os
@@ -423,7 +422,7 @@ class TestDataTypes(BaseTest):
         c = ColorProfile()
         c.update_ansi_color_table(build_ansi_color_table())
         for i in range(8):
-            col = getattr(defaults, 'color{}'.format(i))
+            col = getattr(defaults, f'color{i}')
             self.assertEqual(c.as_color(i << 8 | 1), (col[0], col[1], col[2]))
         self.ae(c.as_color(255 << 8 | 1), (0xee, 0xee, 0xee))
 

kitty_tests/diff.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# vim:fileencoding=utf-8
 # License: GPL v3 Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>
 
 
@@ -37,9 +36,9 @@ class TestDiff(BaseTest):
             self.ae(expected, tuple(split_with_highlights(line, width, [], seg)))
 
         def h(s, e, w):
-            ans = Segment(s, 'S{}S'.format(w))
+            ans = Segment(s, f'S{w}S')
             ans.end = e
-            ans.end_code = 'E{}E'.format(w)
+            ans.end_code = f'E{w}E'
             return ans
 
         highlights = [h(0, 1, 1), h(1, 3, 2)]

kitty_tests/file_transmission.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim:fileencoding=utf-8
 # License: GPLv3 Copyright: 2021, Kovid Goyal <kovid at kovidgoyal.net>
 
 

kitty_tests/fonts.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 os

kitty_tests/glfw.py

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

kitty_tests/gr.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 os
@@ -16,11 +15,11 @@ def clear_screen():
 
 
 def move_cursor(x, y):
-    write('\033[{};{}H'.format(y, x).encode('ascii'))
+    write(f'\033[{y};{x}H'.encode('ascii'))
 
 
 def write_gr_cmd(cmd, payload):
-    cmd = ','.join('{}={}'.format(k, v) for k, v in cmd.items())
+    cmd = ','.join(f'{k}={v}' for k, v in cmd.items())
     w = write
     w(b'\033_G'), w(cmd.encode('ascii')), w(b';'), w(payload), w(b'\033\\')
     sys.stdout.flush()

kitty_tests/graphics.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 os
@@ -95,7 +94,7 @@ def load_helpers(self):
 
     def pl(payload, **kw):
         kw.setdefault('i', 1)
-        cmd = ','.join('%s=%s' % (k, v) for k, v in kw.items())
+        cmd = ','.join(f'{k}={v}' for k, v in kw.items())
         res = send_command(s, cmd, payload)
         return parse_response(res)
 
@@ -176,7 +175,7 @@ def make_send_command(screen):
         if i:
             kw['i'] = i
         kw['a'] = a
-        cmd = ','.join('%s=%s' % (k, v) for k, v in kw.items())
+        cmd = ','.join(f'{k}={v}' for k, v in kw.items())
         res = send_command(screen, cmd, payload)
         return parse_full_response(res)
     return li
@@ -435,7 +434,7 @@ class TestGraphics(BaseTest):
         self.assertEqual(g.disk_cache.total_size, 0)
 
         def li(payload, **kw):
-            cmd = ','.join('%s=%s' % (k, v) for k, v in kw.items())
+            cmd = ','.join(f'{k}={v}' for k, v in kw.items())
             res = send_command(s, cmd, payload)
             return parse_response_with_ids(res)
 
@@ -470,7 +469,7 @@ class TestGraphics(BaseTest):
 
         # test put with number
         def put(**kw):
-            cmd = ','.join('%s=%s' % (k, v) for k, v in kw.items())
+            cmd = ','.join(f'{k}={v}' for k, v in kw.items())
             cmd = 'a=p,' + cmd
             return parse_response_with_ids(send_command(s, cmd))
 
@@ -483,9 +482,9 @@ class TestGraphics(BaseTest):
         def delete(ac='N', **kw):
             cmd = 'a=d'
             if ac:
-                cmd += ',d={}'.format(ac)
+                cmd += f',d={ac}'
             if kw:
-                cmd += ',' + ','.join('{}={}'.format(k, v) for k, v in kw.items())
+                cmd += ',' + ','.join(f'{k}={v}' for k, v in kw.items())
             send_command(s, cmd)
 
         count = s.grman.image_count
@@ -599,9 +598,9 @@ class TestGraphics(BaseTest):
         def delete(ac=None, **kw):
             cmd = 'a=d'
             if ac:
-                cmd += ',d={}'.format(ac)
+                cmd += f',d={ac}'
             if kw:
-                cmd += ',' + ','.join('{}={}'.format(k, v) for k, v in kw.items())
+                cmd += ',' + ','.join(f'{k}={v}' for k, v in kw.items())
             send_command(s, cmd)
 
         put_image(s, cw, ch)

kitty_tests/hints.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# vim:fileencoding=utf-8
 # License: GPL v3 Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>
 
 
@@ -24,12 +23,12 @@ class TestHints(BaseTest):
 
         u = 'http://test.me/'
         t(u, 'http://test.me/')
-        t('"{}"'.format(u), u)
-        t('({})'.format(u), u)
+        t(f'"{u}"', u)
+        t(f'({u})', u)
         t(u + '\nxxx', u + 'xxx', len(u))
-        t('link:{}[xxx]'.format(u), u)
-        t('`xyz <{}>`_.'.format(u), u)
-        t('<a href="{}">moo'.format(u), u)
+        t(f'link:{u}[xxx]', u)
+        t(f'`xyz <{u}>`_.', u)
+        t(f'<a href="{u}">moo', u)
 
     def test_ip_hints(self):
         from kittens.hints.main import parse_hints_args, functions_for, mark, convert_text

kitty_tests/keys.py

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

kitty_tests/layout.py

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

kitty_tests/main.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim:fileencoding=utf-8
 # License: GPLv3 Copyright: 2021, Kovid Goyal <kovid at kovidgoyal.net>
 
 import importlib

kitty_tests/mouse.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# vim:fileencoding=utf-8
 # License: GPL v3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
 
 from functools import partial
@@ -77,7 +76,7 @@ class TestMouse(BaseTest):
             ev(x=x, y=y, button=button)
             if q is not None:
                 s = sel()
-                self.ae(s, q, '{!r} != {!r} after movement to x={} y={}'.format(s, q, x, y))
+                self.ae(s, q, f'{s!r} != {q!r} after movement to x={x} y={y}')
 
         def multi_click(x=0, y=0, count=2):
             clear_click_queue = True

kitty_tests/open_actions.py

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

kitty_tests/options.py

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

kitty_tests/parser.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 time
@@ -126,7 +125,7 @@ class TestParser(BaseTest):
         s.reset()
 
         def sgr(params):
-            return (('select_graphic_rendition', '{} '.format(x)) for x in params.split())
+            return (('select_graphic_rendition', f'{x} ') for x in params.split())
 
         pb('\033[1;2;3;4;7;9;34;44m', *sgr('1 2 3 4 7 9 34 44'))
         for attr in 'bold italic reverse strikethrough dim'.split():
@@ -313,7 +312,7 @@ class TestParser(BaseTest):
         c = s.callbacks
         pb = partial(self.parse_bytes_dump, s)
         q = hexlify(b'kind').decode('ascii')
-        pb('a\033P+q{}\x9cbcde'.format(q), 'a', ('screen_request_capabilities', 43, q), 'bcde')
+        pb(f'a\033P+q{q}\x9cbcde', 'a', ('screen_request_capabilities', 43, q), 'bcde')
         self.ae(str(s.line(0)), 'abcde')
         self.ae(c.wtcbuf, '1+r{}={}'.format(q, '1b5b313b3242').encode('ascii'))
         c.clear()
@@ -325,12 +324,12 @@ class TestParser(BaseTest):
         for sgr in '0;34;102;1;2;3;4 0;38:5:200;58:2:10:11:12'.split():
             expected = set(sgr.split(';')) - {'0'}
             c.clear()
-            parse_bytes(s, '\033[{}m\033P$qm\033\\'.format(sgr).encode('ascii'))
+            parse_bytes(s, f'\033[{sgr}m\033P$qm\033\\'.encode('ascii'))
             r = c.wtcbuf.decode('ascii').partition('r')[2].partition('m')[0]
             self.ae(expected, set(r.split(';')))
         c.clear()
         pb('\033P$qr\033\\', ('screen_request_capabilities', ord('$'), 'r'))
-        self.ae(c.wtcbuf, '\033P1$r{};{}r\033\\'.format(s.margin_top + 1, s.margin_bottom + 1).encode('ascii'))
+        self.ae(c.wtcbuf, f'\033P1$r{s.margin_top + 1};{s.margin_bottom + 1}r\033\\'.encode('ascii'))
 
     def test_sc81t(self):
         s = self.create_screen()
@@ -396,10 +395,10 @@ class TestParser(BaseTest):
         pb = partial(self.parse_bytes_dump, s)
         for prefix in '\033_', '\u009f':
             for suffix in '\u009c', '\033\\':
-                pb('a{}+\\++{}bcde'.format(prefix, suffix), ('draw', 'a'), ('Unrecognized APC code: 0x2b',), ('draw', 'bcde'))
+                pb(f'a{prefix}+\\++{suffix}bcde', ('draw', 'a'), ('Unrecognized APC code: 0x2b',), ('draw', 'bcde'))
         for prefix in '\033^', '\u009e':
             for suffix in '\u009c', '\033\\':
-                pb('a{}+\\++{}bcde'.format(prefix, suffix), ('draw', 'a'), ('Unrecognized PM code: 0x2b',), ('draw', 'bcde'))
+                pb(f'a{prefix}+\\++{suffix}bcde', ('draw', 'a'), ('Unrecognized PM code: 0x2b',), ('draw', 'bcde'))
 
     def test_graphics_command(self):
         from base64 import standard_b64encode
@@ -424,7 +423,7 @@ class TestParser(BaseTest):
             pb('\033_G{};{}\033\\'.format(cmd, enc(kw.get('payload', ''))), c(**kw))
 
         def e(cmd, err):
-            pb('\033_G{}\033\\'.format(cmd), (err,))
+            pb(f'\033_G{cmd}\033\\', (err,))
 
         s = self.create_screen()
         pb = partial(self.parse_bytes_dump, s)

kitty_tests/screen.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# vim:fileencoding=utf-8
 # License: GPL v3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
 
 from kitty.fast_data_types import (
@@ -837,7 +836,7 @@ class TestScreen(BaseTest):
             return parse_bytes(s, f'\033[{code}{p}u'.encode('ascii'))
 
         def ac(flags):
-            parse_bytes(s, '\033[?u'.encode('ascii'))
+            parse_bytes(s, b'\033[?u')
             self.ae(c.wtcbuf, f'\033[?{flags}u'.encode('ascii'))
             c.clear()
 
@@ -926,10 +925,10 @@ class TestScreen(BaseTest):
         s = self.create_screen()
 
         def mark_prompt():
-            parse_bytes(s, '\033]133;A\007'.encode('ascii'))
+            parse_bytes(s, b'\033]133;A\007')
 
         def mark_output():
-            parse_bytes(s, '\033]133;C\007'.encode('ascii'))
+            parse_bytes(s, b'\033]133;C\007')
 
         for i in range(4):
             mark_prompt()

kitty_tests/ssh.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim:fileencoding=utf-8
 # License: GPLv3 Copyright: 2021, Kovid Goyal <kovid at kovidgoyal.net>
 
 

kitty_tests/tui.py

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

kitty_tests/unicode_input.py

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