Add pyupgrade to pre-commit (#1014)

Author: blink1073

.pre-commit-config.yaml

@@ -45,6 +45,14 @@ repos:
     rev: 0.7.16
     hooks:
       - id: mdformat
+        additional_dependencies:
+          [mdformat-gfm, mdformat-frontmatter, mdformat-footnote]
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.1.0
+    hooks:
+      - id: pyupgrade
+        args: [--py38-plus]
 
   - repo: https://github.com/PyCQA/doc8
     rev: v1.0.0

examples/embedding/internal_ipkernel.py

@@ -44,7 +44,7 @@ def print_namespace(self, evt=None):
         print("\n***Variables in User namespace***")
         for k, v in self.namespace.items():
             if not k.startswith("_"):
-                print("%s -> %r" % (k, v))
+                print(f"{k} -> {v!r}")
         sys.stdout.flush()
 
     def new_qt_console(self, evt=None):

ipykernel/eventloops.py

@@ -447,7 +447,7 @@ def close_loop():
 def enable_gui(gui, kernel=None):
     """Enable integration with a given GUI"""
     if gui not in loop_map:
-        e = "Invalid GUI request %r, valid ones are:%s" % (gui, loop_map.keys())
+        e = f"Invalid GUI request {gui!r}, valid ones are:{loop_map.keys()}"
         raise ValueError(e)
     if kernel is None:
         if Application.initialized():

ipykernel/heartbeat.py

@@ -52,15 +52,15 @@ def pick_port(self):
             s.close()
         elif self.transport == "ipc":
             self.port = 1
-            while os.path.exists("%s-%s" % (self.ip, self.port)):
+            while os.path.exists(f"{self.ip}-{self.port}"):
                 self.port = self.port + 1
         else:
             raise ValueError("Unrecognized zmq transport: %s" % self.transport)
         return self.port
 
     def _try_bind_socket(self):
         c = ":" if self.transport == "tcp" else "-"
-        return self.socket.bind("%s://%s" % (self.transport, self.ip) + c + str(self.port))
+        return self.socket.bind(f"{self.transport}://{self.ip}" + c + str(self.port))
 
     def _bind_socket(self):
         try:

ipykernel/ipkernel.py

@@ -600,7 +600,7 @@ def do_apply(self, content, bufs, msg_id, reply_metadata):
             ns = {fname: f, argname: args, kwargname: kwargs, resultname: None}
             # print ns
             working.update(ns)
-            code = "%s = %s(*%s,**%s)" % (resultname, fname, argname, kwargname)
+            code = f"{resultname} = {fname}(*{argname},**{kwargname})"
             try:
                 exec(code, shell.user_global_ns, shell.user_ns)
                 result = working.get(resultname)

ipykernel/kernelapp.py

@@ -212,7 +212,7 @@ def init_poller(self):
             self.poller = ParentPollerUnix()
 
     def _try_bind_socket(self, s, port):
-        iface = "%s://%s" % (self.transport, self.ip)
+        iface = f"{self.transport}://{self.ip}"
         if self.transport == "tcp":
             if port <= 0:
                 port = s.bind_to_random_port(iface)

ipykernel/kernelbase.py

@@ -1083,7 +1083,7 @@ def _topic(self, topic):
         """prefixed topic for IOPub messages"""
         base = "kernel.%s" % self.ident
 
-        return ("%s.%s" % (base, topic)).encode()
+        return (f"{base}.{topic}").encode()
 
     _aborting = Bool(False)
 

ipykernel/kernelspec.py

@@ -242,7 +242,7 @@ def start(self):
                     print("Perhaps you want `sudo` or `--user`?", file=sys.stderr)
                 self.exit(1)
             raise
-        print("Installed kernelspec %s in %s" % (opts.name, dest))
+        print(f"Installed kernelspec {opts.name} in {dest}")
 
 
 if __name__ == "__main__":

ipykernel/tests/test_kernel.py

@@ -203,7 +203,7 @@ def test_raw_input():
 
         input_f = "input"
         theprompt = "prompt> "
-        code = 'print({input_f}("{theprompt}"))'.format(**locals())
+        code = f'print({input_f}("{theprompt}"))'
         msg_id = kc.execute(code, allow_stdin=True)
         msg = kc.get_stdin_msg(timeout=TIMEOUT)
         assert msg["header"]["msg_type"] == "input_request"

ipykernel/tests/test_message_spec.py

@@ -74,9 +74,9 @@ def __init__(self, *args, **kwargs):
 
     def validate(self, obj, value):
         if self.min and V(value) < V(self.min):
-            raise TraitError("bad version: %s < %s" % (value, self.min))
+            raise TraitError(f"bad version: {value} < {self.min}")
         if self.max and (V(value) > V(self.max)):
-            raise TraitError("bad version: %s > %s" % (value, self.max))
+            raise TraitError(f"bad version: {value} > {self.max}")
 
 
 class RMessage(Reference):