apply pyupgrade + update pre-commit

Author: RonnyPfannschmidt

.pre-commit-config.yaml

@@ -1,26 +1,30 @@
 exclude: doc/en/example/py2py3/test_py2.py
 repos:
 -   repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 22.12.0
     hooks:
     -   id: black
-        args: [--safe, --quiet]
 -   repo: https://github.com/asottile/blacken-docs
     rev: v1.12.1
     hooks:
     -   id: blacken-docs
-        additional_dependencies: [black==19.3b0]
+        additional_dependencies: [black==22.12.0]
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.4.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: check-yaml
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v3.3.1
+    hooks:
+    -   id: pyupgrade
+        args:  [--py37-plus]
 -   repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.1.0
+    rev: v3.9.0
     hooks:
     -   id: reorder-python-imports
-        args: ['--application-directories=execnet']
+        args: ['--application-directories=execnet', --py37-plus]
 -   repo: local
     hooks:
     -   id: rst

CHANGELOG.rst

@@ -2,8 +2,10 @@
 ------------------
 
 * removed support for Python < 3.7
+  * apply pyupgrade --py37-plus
 * migrate packaging to hatch
 
+
 1.9.0 (2021-06-13)
 ------------------
 

doc/example/popen_read_multiple.py

@@ -3,8 +3,6 @@
 
 reading results from possibly blocking code running in sub processes.
 """
-from __future__ import print_function
-
 import execnet
 
 NUM_PROCESSES = 5

doc/example/redirect_remote_output.py

@@ -7,8 +7,6 @@
 - setting a callback for receiving channel data
 
 """
-from __future__ import print_function
-
 import execnet
 
 gw = execnet.makegateway()

doc/example/svn-sync-repo.py

@@ -5,8 +5,6 @@
 uses execnet.
 
 """
-from __future__ import print_function
-
 import os
 import sys
 
@@ -23,7 +21,7 @@ def main(args):
     remote = args[0]
     localrepo = py.path.local(args[1])
     if not localrepo.check(dir=1):
-        raise SystemExit("localrepo {} does not exist".format(localrepo))
+        raise SystemExit(f"localrepo {localrepo} does not exist")
     if len(args) == 3:
         configfile = args[2]
     else:
@@ -95,7 +93,7 @@ def svn_load(repo, dumpchannel, maxcount=100):
     # growing buffers  (execnet does not control
     # RAM usage or receive queue sizes)
     dumpchannel.send(maxcount)
-    f = os.popen("svnadmin load -q {}".format(repo), "w")
+    f = os.popen(f"svnadmin load -q {repo}", "w")
     count = maxcount
     for x in dumpchannel:
         sys.stdout.write(".")

doc/example/sysinfo.py

@@ -127,21 +127,21 @@ def error(*args):
 
 def getinfo(sshname, ssh_config=None, loginfo=sys.stdout):
     if ssh_config:
-        spec = "ssh=-F {} {}".format(ssh_config, sshname)
+        spec = f"ssh=-F {ssh_config} {sshname}"
     else:
         spec += "ssh=%s" % sshname
     debug("connecting to", repr(spec))
     try:
         gw = execnet.makegateway(spec)
-    except IOError:
+    except OSError:
         error("could not get sshgatway", sshname)
     else:
         ri = RemoteInfo(gw)
         # print "%s info:" % sshname
         prefix = sshname.upper() + " "
         print >> loginfo, prefix, "fqdn:", ri.getfqdn()
         for attr in ("sys.platform", "sys.version_info"):
-            loginfo.write("{} {}: ".format(prefix, attr))
+            loginfo.write(f"{prefix} {attr}: ")
             loginfo.flush()
             value = ri.getmodattr(attr)
             loginfo.write(str(value))

doc/example/taskserver.py

@@ -36,14 +36,14 @@ def process_item(channel):
             break
         continue
     if item != "ready":
-        print("other side {} returned {!r}".format(channel.gateway.id, item))
+        print(f"other side {channel.gateway.id} returned {item!r}")
     if not tasks:
         print("no tasks remain, sending termination request to all")
         mch.send_each(None)
         tasks = -1
     if tasks and tasks != -1:
         task = tasks.pop()
         channel.send(task)
-        print("sent task {!r} to {}".format(task, channel.gateway.id))
+        print(f"sent task {task!r} to {channel.gateway.id}")
 
 group.terminate()

execnet/deprecated.py

@@ -25,7 +25,7 @@ def SocketGateway(host, port):
     new_remote() method on existing gateways.
     """
     APIWARN("1.0.0b4", "use makegateway('socket=host:port')")
-    spec = execnet.XSpec("socket={}:{}".format(host, port))
+    spec = execnet.XSpec(f"socket={host}:{port}")
     return execnet.default_group.makegateway(spec)
 
 
@@ -44,5 +44,5 @@ def SshGateway(sshaddress, remotepython=None, ssh_config=None):
 def APIWARN(version, msg, stacklevel=3):
     import warnings
 
-    Warn = DeprecationWarning("(since version {}) {}".format(version, msg))
+    Warn = DeprecationWarning(f"(since version {version}) {msg}")
     warnings.warn(Warn, stacklevel=stacklevel)

execnet/gateway.py

@@ -21,7 +21,7 @@ class Gateway(gateway_base.BaseGateway):
     """Gateway to a local or remote Python Intepreter."""
 
     def __init__(self, io, spec):
-        super(Gateway, self).__init__(io=io, id=spec.id, _startcount=1)
+        super().__init__(io=io, id=spec.id, _startcount=1)
         self.spec = spec
         self._initreceive()
 
@@ -56,7 +56,7 @@ def exit(self):
             self._send(Message.GATEWAY_TERMINATE)
             self._trace("--> io.close_write")
             self._io.close_write()
-        except (ValueError, EOFError, IOError):
+        except (ValueError, EOFError, OSError):
             v = sys.exc_info()[1]
             self._trace("io-error: could not send termination sequence")
             self._trace(" exception: %r" % v)
@@ -211,7 +211,7 @@ def _source_of_function(function):
 
     try:
         source = inspect.getsource(function)
-    except IOError:
+    except OSError:
         raise ValueError("can't find source file for %s" % function)
 
     source = textwrap.dedent(source)  # just for inner functions