Format code with ruff

Author: mkrnr

.github/workflows/ci/workflow_generate.py

@@ -8,73 +8,82 @@
 
 
 class GithubActionsYamlLoader(yaml.SafeLoader):
-
     @staticmethod
     def _unsupported(kind, token):
-        return SyntaxError('Github Actions does not support %s:\n%s' % (kind, token.start_mark))
+        return SyntaxError(
+            "Github Actions does not support %s:\n%s" % (kind, token.start_mark)
+        )
 
     def fetch_alias(self):
         super().fetch_alias()
-        raise self._unsupported('aliases', self.tokens[0])
+        raise self._unsupported("aliases", self.tokens[0])
 
     def fetch_anchor(self):
         super().fetch_anchor()
-        raise self._unsupported('anchors', self.tokens[0])
+        raise self._unsupported("anchors", self.tokens[0])
 
 
 environment = jinja2.Environment(
-    block_start_string='<%',
-    block_end_string='%>',
-    variable_start_string='<@',
-    variable_end_string='@>',
-    comment_start_string='<#',
-    comment_end_string='#>',
+    block_start_string="<%",
+    block_end_string="%>",
+    variable_start_string="<@",
+    variable_end_string="@>",
+    comment_start_string="<#",
+    comment_end_string="#>",
     lstrip_blocks=True,
     trim_blocks=True,
 )
 
-with open('.github/workflows/ci/workflow_context.yml') as fp:
+with open(".github/workflows/ci/workflow_context.yml") as fp:
     context = yaml.load(fp, Loader=yaml.SafeLoader)
-with open('.github/workflows/ci/workflow_template.yml') as fp:
+with open(".github/workflows/ci/workflow_template.yml") as fp:
     template = environment.from_string(fp.read())
 
-for j in context['jobs']:
-    base_type = j['type'].split('_')[0]
-    j['id'] = '%s_%s' % (base_type, j['variant'].lower().replace(' ', '_').replace('.', ''))
-    j['name'] = '%s (%s)' % (base_type.capitalize(), j['variant'])
-    j['needs'] = j.get('needs', [])
-    j['reqs'] = ['reqs/%s.txt' % r for r in j['reqs']]
-    j['cache_extra_deps'] = j.get('cache_extra_deps', [])
-    if 'python' not in j:
-        j['python'] = context['default_python']
-
-    if context['skippy_enabled']:
+for j in context["jobs"]:
+    base_type = j["type"].split("_")[0]
+    j["id"] = "%s_%s" % (
+        base_type,
+        j["variant"].lower().replace(" ", "_").replace(".", ""),
+    )
+    j["name"] = "%s (%s)" % (base_type.capitalize(), j["variant"])
+    j["needs"] = j.get("needs", [])
+    j["reqs"] = ["reqs/%s.txt" % r for r in j["reqs"]]
+    j["cache_extra_deps"] = j.get("cache_extra_deps", [])
+    if "python" not in j:
+        j["python"] = context["default_python"]
+
+    if context["skippy_enabled"]:
         # Path to the "skip_cache" file.
-        j['skip_cache_path'] = '.skip_cache_{id}'.format(**j)
+        j["skip_cache_path"] = ".skip_cache_{id}".format(**j)
         # Name of the "skip_cache" (name + tree SHA1 = key).
-        j['skip_cache_name'] = 'skip_{id}_py-{python}_{platform}'.format(cache_epoch=context['cache_epoch'], **j)
+        j["skip_cache_name"] = "skip_{id}_py-{python}_{platform}".format(
+            cache_epoch=context["cache_epoch"], **j
+        )
     shell_definition = []
     for k, v in sorted(j.items()):
         if isinstance(v, list):
-            v = '(' + ' '.join(map(shlex.quote, v)) + ')'
+            v = "(" + " ".join(map(shlex.quote, v)) + ")"
         else:
             v = shlex.quote(v)
-        shell_definition.append('job_%s=%s' % (k, v))
-    j['shell_definition'] = '; '.join(shell_definition)
+        shell_definition.append("job_%s=%s" % (k, v))
+    j["shell_definition"] = "; ".join(shell_definition)
 
 # Render template.
 workflow = template.render(context)
 
 # Save result.
-with open('.github/workflows/ci.yml', 'w') as fp:
-    fp.write(textwrap.dedent(
-        '''
+with open(".github/workflows/ci.yml", "w") as fp:
+    fp.write(
+        textwrap.dedent(
+            """
         #
         # DO NOT MODIFY! AUTO-GENERATED FROM:
         # .github/workflows/ci/workflow_template.yml
         #
 
-        ''').lstrip())
+        """
+        ).lstrip()
+    )
     fp.write(workflow)
 
 # And try parsing it to check it's valid YAML,

doc/conf.py

@@ -12,9 +12,9 @@
 # -- General configuration ---------------------------------------------------
 
 extensions = [
-  "sphinx_plover",
-  "myst_parser",
-  "sphinx.ext.todo",
+    "sphinx_plover",
+    "myst_parser",
+    "sphinx.ext.todo",
 ]
 
 myst_enable_extensions = ["colon_fence"]
@@ -41,32 +41,32 @@
 html_favicon = "_static/favicon.ico"
 
 html_css_files = [
-  "custom.css",
+    "custom.css",
 ]
 
 html_theme_options = {
-  "navigation_with_keys": True,
-  "light_css_variables": {
-    "color-brand-primary": "#3d6961",
-    "color-brand-content": "#3d6961",
-    "color-sidebar-background": "#3d6961",
-    "color-sidebar-brand-text": "white",
-    "color-sidebar-brand-text--hover": "white",
-    "color-sidebar-caption-text": "white",
-    "color-sidebar-link-text": "white",
-    "color-sidebar-link-text--top-level": "white",
-    "color-sidebar-item-background--hover": "#71a89f",
-    "color-sidebar-item-expander-background--hover": "#71a89f",
-    "color-inline-code-background": "transparent",
-    "font-stack--header": "'Patua One', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji'",
-    "font-stack--monospace": "'JetBrains Mono', SFMono-Regular, Menlo, Consolas, Monaco, Liberation Mono, Lucida Console, monospace",
-  },
-  "dark_css_variables": {
-    "color-link": "#68a69b",
-    "color-link--hover": "#68a69b",
-  },
-  "light_logo": "dolores.svg",
-  "dark_logo": "dolores.svg",
+    "navigation_with_keys": True,
+    "light_css_variables": {
+        "color-brand-primary": "#3d6961",
+        "color-brand-content": "#3d6961",
+        "color-sidebar-background": "#3d6961",
+        "color-sidebar-brand-text": "white",
+        "color-sidebar-brand-text--hover": "white",
+        "color-sidebar-caption-text": "white",
+        "color-sidebar-link-text": "white",
+        "color-sidebar-link-text--top-level": "white",
+        "color-sidebar-item-background--hover": "#71a89f",
+        "color-sidebar-item-expander-background--hover": "#71a89f",
+        "color-inline-code-background": "transparent",
+        "font-stack--header": "'Patua One', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji'",
+        "font-stack--monospace": "'JetBrains Mono', SFMono-Regular, Menlo, Consolas, Monaco, Liberation Mono, Lucida Console, monospace",
+    },
+    "dark_css_variables": {
+        "color-link": "#68a69b",
+        "color-link--hover": "#68a69b",
+    },
+    "light_logo": "dolores.svg",
+    "dark_logo": "dolores.svg",
 }
 
 from pygments.lexer import RegexLexer, bygroups
@@ -75,26 +75,26 @@
 
 
 class RTFLexer(RegexLexer):
-  name = "rtf"
-
-  tokens = {
-    "root": [
-      (r"(\\[a-z*\\_~\{\}]+)(-?\d+)?", bygroups(t.Keyword, t.Number.Integer)),
-      (r"{\\\*\\cxcomment\s+", t.Comment.Multiline, "comment"),
-      (
-        r"({)(\\\*\\cxs)(\s+)([A-Z#0-9\-/#!,]+)(})",
-        bygroups(t.Operator, t.Keyword, t.Text, t.String, t.Operator),
-      ),
-      (r"{", t.Operator),
-      (r"}", t.Operator),
-      (r".+?", t.Text),
-    ],
-    "comment": [
-      (r"{", t.Comment.Multiline, "#push"),
-      (r"}", t.Comment.Multiline, "#pop"),
-      (r".+", t.Comment.Multiline),
-    ],
-  }
+    name = "rtf"
+
+    tokens = {
+        "root": [
+            (r"(\\[a-z*\\_~\{\}]+)(-?\d+)?", bygroups(t.Keyword, t.Number.Integer)),
+            (r"{\\\*\\cxcomment\s+", t.Comment.Multiline, "comment"),
+            (
+                r"({)(\\\*\\cxs)(\s+)([A-Z#0-9\-/#!,]+)(})",
+                bygroups(t.Operator, t.Keyword, t.Text, t.String, t.Operator),
+            ),
+            (r"{", t.Operator),
+            (r"}", t.Operator),
+            (r".+?", t.Text),
+        ],
+        "comment": [
+            (r"{", t.Comment.Multiline, "#push"),
+            (r"}", t.Comment.Multiline, "#pop"),
+            (r".+", t.Comment.Multiline),
+        ],
+    }
 
 
 lexers["rtf"] = RTFLexer(startinline=True)

linux/appimage/pyinfo.py

@@ -1,14 +1,21 @@
 from distutils import sysconfig
 import sys
 
-print("; ".join("py%s=%r" % (k, v) for k, v in sorted({
-    'exe'    : sys.executable,
-    'prefix' : getattr(sys, "base_prefix", sys.prefix),
-    'version': sysconfig.get_python_version(),
-    'include': sysconfig.get_python_inc(prefix=''),
-    'ldlib'  : sysconfig.get_config_var('LDLIBRARY'),
-    'py3lib' : sysconfig.get_config_var('PY3LIBRARY'),
-    'stdlib' : sysconfig.get_python_lib(standard_lib=1, prefix=''),
-    'purelib': sysconfig.get_python_lib(plat_specific=0, prefix=''),
-    'platlib': sysconfig.get_python_lib(plat_specific=1, prefix=''),
-}.items())))
+print(
+    "; ".join(
+        "py%s=%r" % (k, v)
+        for k, v in sorted(
+            {
+                "exe": sys.executable,
+                "prefix": getattr(sys, "base_prefix", sys.prefix),
+                "version": sysconfig.get_python_version(),
+                "include": sysconfig.get_python_inc(prefix=""),
+                "ldlib": sysconfig.get_config_var("LDLIBRARY"),
+                "py3lib": sysconfig.get_config_var("PY3LIBRARY"),
+                "stdlib": sysconfig.get_python_lib(standard_lib=1, prefix=""),
+                "purelib": sysconfig.get_python_lib(plat_specific=0, prefix=""),
+                "platlib": sysconfig.get_python_lib(plat_specific=1, prefix=""),
+            }.items()
+        )
+    )
+)

osx/dmg_resources/settings.py

@@ -3,39 +3,37 @@
 import plistlib
 import os.path
 
-application = defines.get('app', './dist/Plover.app')
+application = defines.get("app", "./dist/Plover.app")
 appname = os.path.basename(application)
 
 
 def icon_from_app(app_path):
-    plist_path = os.path.join(app_path, 'Contents', 'Info.plist')
-    with open(plist_path, 'rb') as plist_file:
+    plist_path = os.path.join(app_path, "Contents", "Info.plist")
+    with open(plist_path, "rb") as plist_file:
         plist = plistlib.load(plist_file)
-    icon_name = plist['CFBundleIconFile']
+    icon_name = plist["CFBundleIconFile"]
     icon_root, icon_ext = os.path.splitext(icon_name)
     if not icon_ext:
-        icon_ext = '.icns'
+        icon_ext = ".icns"
     icon_name = icon_root + icon_ext
-    return os.path.join(app_path, 'Contents', 'Resources', icon_name)
+    return os.path.join(app_path, "Contents", "Resources", icon_name)
 
-format = defines.get('format', 'UDBZ')
+
+format = defines.get("format", "UDBZ")
 
 # Files to include
 files = [application]
 
 # Symlinks to create
-symlinks = {'Applications': '/Applications'}
+symlinks = {"Applications": "/Applications"}
 
 # Volume icon
 badge_icon = icon_from_app(application)
 
 # Where to put the icons
-icon_locations = {
-    appname:        (114, 244),
-    'Applications': (527, 236)
-}
+icon_locations = {appname: (114, 244), "Applications": (527, 236)}
 
-background = 'osx/dmg_resources/background.png'
+background = "osx/dmg_resources/background.png"
 
 show_status_bar = False
 show_tab_view = False
@@ -46,15 +44,15 @@ def icon_from_app(app_path):
 # Window position in ((x, y), (w, h)) format
 window_rect = ((100, 100), (640, 380))
 
-default_view = 'icon-view'
+default_view = "icon-view"
 show_icon_preview = False
-include_icon_view_settings = 'auto'
-include_list_view_settings = 'auto'
+include_icon_view_settings = "auto"
+include_list_view_settings = "auto"
 
 arrange_by = None
 grid_offset = (0, 0)
 grid_spacing = 50
 scroll_position = (0, 0)
-label_pos = 'bottom'
+label_pos = "bottom"
 text_size = 16
 icon_size = 86

plover/__init__.py

@@ -3,19 +3,20 @@
 
 """Plover: Open Source Stenography Software"""
 
-if __name__ == 'plover':
+if __name__ == "plover":
     from plover.i18n import Translator
+
     _ = Translator(__package__)
 else:
     # exec from `setup.py`, package data
     # may not be available, and we don't
     # want to translate anyway.
     _ = lambda s: s
 
-__version__ = '5.0.0.dev2'
-__copyright__ = '(C) Open Steno Project'
-__url__ = 'http://www.openstenoproject.org/'
-__download_url__ = 'http://www.openstenoproject.org/plover'
+__version__ = "5.0.0.dev2"
+__copyright__ = "(C) Open Steno Project"
+__url__ = "http://www.openstenoproject.org/"
+__download_url__ = "http://www.openstenoproject.org/plover"
 __credits__ = _("""\
 Founded by stenographer Mirabai Knight.
 
@@ -30,9 +31,9 @@
 
 and many more on GitHub:
 <https://github.com/openstenoproject/plover>""")
-__license__ = 'GNU General Public License v2 or later (GPLv2+)'
+__license__ = "GNU General Public License v2 or later (GPLv2+)"
 # i18n: Short description for Plover, currently not used in the interface.
-__description__ = _('Open Source Stenography Software')
+__description__ = _("Open Source Stenography Software")
 __long_description__ = _("""\
 Plover is a free open source program intended to bring realtime
 stenographic technology not just to stenographers, but also to

plover/__main__.py

@@ -1,5 +1,5 @@
 from plover.scripts.main import main
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

plover/command/set_config.py

@@ -22,11 +22,14 @@ def set_config(engine, cmdline):
 
 
 def _cmdline_to_dict(cmdline):
-    """ Add braces and parse the entire command line as a Python dict literal. """
+    """Add braces and parse the entire command line as a Python dict literal."""
     try:
-        opt_dict = ast.literal_eval('{'+cmdline+'}')
+        opt_dict = ast.literal_eval("{" + cmdline + "}")
         assert isinstance(opt_dict, dict)
         return opt_dict
     except (AssertionError, SyntaxError, ValueError) as e:
-        raise ValueError('Bad command string "%s" for PLOVER:SET_CONFIG.\n' % cmdline
-                         + 'See for reference:\n\n' + set_config.__doc__) from e
+        raise ValueError(
+            'Bad command string "%s" for PLOVER:SET_CONFIG.\n' % cmdline
+            + "See for reference:\n\n"
+            + set_config.__doc__
+        ) from e