Upgrade syntax to 3.8

Author: linuxdaemon

.pre-commit-config.yaml

@@ -48,6 +48,13 @@ repos:
   hooks:
   - id: python-no-eval
   - id: python-no-log-warn
+- repo: https://github.com/asottile/pyupgrade
+  rev: df17dfa3911b81b4a27190b0eea5b1debc7ffa0a  # frozen: v3.15.1
+  hooks:
+  - id: pyupgrade
+    args:
+    - "--py38-plus"
+
 - repo: local
   hooks:
   - id: mypy

cloudbot/__main__.py

@@ -42,7 +42,7 @@ def exit_gracefully(signum, frame):
             stopped_while_restarting = True
         else:
             async_util.run_coroutine_threadsafe(
-                _bot.stop("Killed (Received SIGINT {})".format(signum)),
+                _bot.stop(f"Killed (Received SIGINT {signum})"),
                 _bot.loop,
             )
 

cloudbot/bot.py

@@ -431,9 +431,7 @@ def add_hook(hook, _event, _run_before=False):
                                 command for command, plugin in potential_matches
                             )
                             txt_list = formatting.get_text_list(commands)
-                            event.notice(
-                                "Possible matches: {}".format(txt_list)
-                            )
+                            event.notice(f"Possible matches: {txt_list}")
 
         if event.type in (EventType.message, EventType.action):
             # Regex hooks

cloudbot/clients/irc.py

@@ -21,14 +21,12 @@
 irc_nick_re = re.compile(r"[A-Za-z0-9^{}\[\]\-`_|\\]+")
 
 irc_bad_chars = "".join(
-    (
-        c
-        for c in (chr(x) for x in chain(range(0, 32), range(127, 160)))
-        if c not in colors.IRC_FORMATTING_DICT.values() and c != "\1"
-    )
+    c
+    for c in (chr(x) for x in chain(range(0, 32), range(127, 160)))
+    if c not in colors.IRC_FORMATTING_DICT.values() and c != "\1"
 )
 
-irc_clean_re = re.compile("[{}]".format(re.escape(irc_bad_chars)))
+irc_clean_re = re.compile(f"[{re.escape(irc_bad_chars)}]")
 
 
 def irc_clean(dirty: str) -> str:
@@ -205,9 +203,9 @@ def make_ssl_context(self, conn_config):
 
     def describe_server(self):
         if self.use_ssl:
-            return "+{}:{}".format(self.server, self.port)
+            return f"+{self.server}:{self.port}"
 
-        return "{}:{}".format(self.server, self.port)
+        return f"{self.server}:{self.port}"
 
     async def auto_reconnect(self):
         """
@@ -232,7 +230,7 @@ async def try_connect(self):
                     self.name,
                     self.describe_server(),
                 )
-            except (socket.error, socket.gaierror, OSError, ssl.SSLError):
+            except (OSError, socket.gaierror, ssl.SSLError):
                 logger.error(
                     "[%s] Error occurred while connecting to %s (%s)",
                     self.name,
@@ -365,7 +363,7 @@ def ctcp(self, target, ctcp_type, text):
         """
         Makes the bot send a PRIVMSG CTCP of type <ctcp_type> to the target
         """
-        out = "\x01{} {}\x01".format(ctcp_type, text)
+        out = f"\x01{ctcp_type} {text}\x01"
         self.cmd("PRIVMSG", target, out)
 
     def cmd(self, command, *params):

cloudbot/event.py

@@ -264,7 +264,7 @@ def reply(self, *messages, target=None):
             self.conn.message(target, *messages)
         else:
             self.conn.message(
-                target, "({}) {}".format(self.nick, messages[0]), *messages[1:]
+                target, f"({self.nick}) {messages[0]}", *messages[1:]
             )
 
     def action(self, message, target=None):

cloudbot/hook.py

@@ -70,7 +70,7 @@ def add_hook(self, alias_param, kwargs):
             self.main_alias = alias_param[0]
         for alias in alias_param:
             if not valid_command_re.match(alias):
-                raise ValueError("Invalid command name {}".format(alias))
+                raise ValueError(f"Invalid command name {alias}")
         self.aliases.update(alias_param)
 
 
@@ -145,7 +145,7 @@ def add_hook(self, trigger_param, kwargs):
 
 class _CapHook(_Hook):
     def __init__(self, func, _type):
-        super().__init__(func, "on_cap_{}".format(_type))
+        super().__init__(func, f"on_cap_{_type}")
         self.caps = set()
 
     def add_hook(self, caps, kwargs):

cloudbot/plugin.py

@@ -228,7 +228,7 @@ async def load_plugin(self, path):
         if self.get_plugin(file_path):
             await self.unload_plugin(file_path)
 
-        module_name = "plugins.{}".format(title)
+        module_name = f"plugins.{title}"
         try:
             plugin_module = self._load_mod(module_name)
         except Exception:

cloudbot/plugin_hooks.py

@@ -67,7 +67,7 @@ def __init__(self, _type, plugin, func_hook):
 
     @property
     def description(self):
-        return "{}:{}".format(self.plugin.title, self.function_name)
+        return f"{self.plugin.title}:{self.function_name}"
 
     def __repr__(self):
         parts = [
@@ -77,7 +77,7 @@ def __repr__(self):
             ("single_thread", self.single_thread),
             ("threaded", self.threaded),
         ]
-        return ", ".join("{}: {}".format(k, v) for k, v in parts)
+        return ", ".join(f"{k}: {v}" for k, v in parts)
 
 
 class CommandHook(Hook):
@@ -180,7 +180,7 @@ def __init__(self, plugin, sieve_hook):
         super().__init__("sieve", plugin, sieve_hook)
 
     def __repr__(self):
-        return "Sieve[{}]".format(Hook.__repr__(self))
+        return f"Sieve[{Hook.__repr__(self)}]"
 
     def __str__(self):
         return "sieve {} from {}".format(
@@ -213,7 +213,7 @@ def __init__(self, plugin, on_start_hook):
         super().__init__("on_start", plugin, on_start_hook)
 
     def __repr__(self):
-        return "On_start[{}]".format(Hook.__repr__(self))
+        return f"On_start[{Hook.__repr__(self)}]"
 
     def __str__(self):
         return "on_start {} from {}".format(
@@ -226,7 +226,7 @@ def __init__(self, plugin, on_stop_hook):
         super().__init__("on_stop", plugin, on_stop_hook)
 
     def __repr__(self):
-        return "On_stop[{}]".format(Hook.__repr__(self))
+        return f"On_stop[{Hook.__repr__(self)}]"
 
     def __str__(self):
         return "on_stop {} from {}".format(
@@ -236,7 +236,7 @@ def __str__(self):
 
 class CapHook(Hook):
     def __init__(self, _type, plugin, base_hook):
-        super().__init__("on_cap_{}".format(_type), plugin, base_hook)
+        super().__init__(f"on_cap_{_type}", plugin, base_hook)
 
         self.caps = base_hook.caps
 
@@ -267,7 +267,7 @@ def __init__(self, plugin, sieve_hook):
         super().__init__("on_connect", plugin, sieve_hook)
 
     def __repr__(self):
-        return "{name}[{base!r}]".format(name=self.type, base=super())
+        return f"{self.type}[{super()!r}]"
 
     def __str__(self):
         return "{name} {func} from {file}".format(
@@ -280,7 +280,7 @@ def __init__(self, plugin, out_hook):
         super().__init__("irc_out", plugin, out_hook)
 
     def __repr__(self):
-        return "Irc_Out[{}]".format(Hook.__repr__(self))
+        return f"Irc_Out[{Hook.__repr__(self)}]"
 
     def __str__(self):
         return "irc_out {} from {}".format(
@@ -293,7 +293,7 @@ def __init__(self, plugin, out_hook):
         super().__init__("post_hook", plugin, out_hook)
 
     def __repr__(self):
-        return "Post_hook[{}]".format(Hook.__repr__(self))
+        return f"Post_hook[{Hook.__repr__(self)}]"
 
     def __str__(self):
         return "post_hook {} from {}".format(
@@ -319,7 +319,7 @@ def __init__(self, plugin, perm_hook):
         self.perms = perm_hook.perms
 
     def __repr__(self):
-        return "PermHook[{}]".format(Hook.__repr__(self))
+        return f"PermHook[{Hook.__repr__(self)}]"
 
     def __str__(self):
         return "perm hook {} from {}".format(

cloudbot/reloader.py

@@ -74,9 +74,7 @@ async def _unload(self, path):
 
 class ConfigReloader(Reloader):
     def __init__(self, bot):
-        super().__init__(
-            bot, ConfigEventHandler, "*{}".format(bot.config.filename)
-        )
+        super().__init__(bot, ConfigEventHandler, f"*{bot.config.filename}")
 
     def reload(self, path):
         if self.bot.running:

cloudbot/util/formatting.py

@@ -265,7 +265,7 @@ def pluralize_suffix(num=0, text="", suffix="s"):
 
 
 def pluralize_select(count, single, plural):
-    return "{:,} {}".format(count, single if count == 1 else plural)
+    return f"{count:,} {single if count == 1 else plural}"
 
 
 pluralise_select = pluralize_select
@@ -369,7 +369,7 @@ def get_text_list(list_, last_word="or"):
     if len(list_) == 1:
         return list_[0]
 
-    return "%s %s %s" % (
+    return "{} {} {}".format(
         # Translators: This string is used as a separator between list elements
         ", ".join([i for i in list_][:-1]),
         last_word,