Update pre-commit hooks versions

Author: nicoddemus

.pre-commit-config.yaml

@@ -1,24 +1,24 @@
 exclude: doc/en/example/py2py3/test_py2.py
 repos:
 -   repo: https://github.com/python/black
-    rev: 19.3b0
+    rev: 20.8b1
     hooks:
     -   id: black
         args: [--safe, --quiet]
 -   repo: https://github.com/asottile/blacken-docs
-    rev: v1.0.0
+    rev: v1.9.2
     hooks:
     -   id: blacken-docs
         additional_dependencies: [black==19.3b0]
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.2.3
+    rev: v3.4.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: fix-encoding-pragma
     -   id: check-yaml
 -   repo: https://github.com/asottile/reorder_python_imports
-    rev: v1.4.0
+    rev: v2.3.6
     hooks:
     -   id: reorder-python-imports
         args: ['--application-directories=execnet']

doc/example/sysinfo.py

@@ -41,7 +41,7 @@ def parsehosts(path):
     for line in path.readlines():
         m = rex.match(line)
         if m is not None:
-            sshname, = m.groups()
+            (sshname,) = m.groups()
             l.append(sshname)
     return l
 

execnet/deprecated.py

@@ -8,8 +8,8 @@
 
 
 def PopenGateway(python=None):
-    """ instantiate a gateway to a subprocess
-        started with the given 'python' executable.
+    """instantiate a gateway to a subprocess
+    started with the given 'python' executable.
     """
     APIWARN("1.0.0b4", "use makegateway('popen')")
     spec = execnet.XSpec("popen")
@@ -18,22 +18,22 @@ def PopenGateway(python=None):
 
 
 def SocketGateway(host, port):
-    """ This Gateway provides interaction with a remote process
-        by connecting to a specified socket.  On the remote
-        side you need to manually start a small script
-        (py/execnet/script/socketserver.py) that accepts
-        SocketGateway connections or use the experimental
-        new_remote() method on existing gateways.
+    """This Gateway provides interaction with a remote process
+    by connecting to a specified socket.  On the remote
+    side you need to manually start a small script
+    (py/execnet/script/socketserver.py) that accepts
+    SocketGateway connections or use the experimental
+    new_remote() method on existing gateways.
     """
     APIWARN("1.0.0b4", "use makegateway('socket=host:port')")
     spec = execnet.XSpec("socket={}:{}".format(host, port))
     return execnet.default_group.makegateway(spec)
 
 
 def SshGateway(sshaddress, remotepython=None, ssh_config=None):
-    """ instantiate a remote ssh process with the
-        given 'sshaddress' and remotepython version.
-        you may specify an ssh_config file.
+    """instantiate a remote ssh process with the
+    given 'sshaddress' and remotepython version.
+    you may specify an ssh_config file.
     """
     APIWARN("1.0.0b4", "use makegateway('ssh=host')")
     spec = execnet.XSpec("ssh=%s" % sshaddress)

execnet/gateway.py

@@ -42,7 +42,7 @@ def __repr__(self):
         )
 
     def exit(self):
-        """ trigger gateway exit.  Defer waiting for finishing
+        """trigger gateway exit.  Defer waiting for finishing
         of receiver-thread and subprocess activity to when
         group.terminate() is called.
         """
@@ -93,20 +93,20 @@ def remote_status(self):
         return RemoteStatus(statusdict)
 
     def remote_exec(self, source, **kwargs):
-        """ return channel object and connect it to a remote
-            execution thread where the given ``source`` executes.
-
-            * ``source`` is a string: execute source string remotely
-              with a ``channel`` put into the global namespace.
-            * ``source`` is a pure function: serialize source and
-              call function with ``**kwargs``, adding a
-              ``channel`` object to the keyword arguments.
-            * ``source`` is a pure module: execute source of module
-              with a ``channel`` in its global namespace
-
-            In all cases the binding ``__name__='__channelexec__'``
-            will be available in the global namespace of the remotely
-            executing code.
+        """return channel object and connect it to a remote
+        execution thread where the given ``source`` executes.
+
+        * ``source`` is a string: execute source string remotely
+          with a ``channel`` put into the global namespace.
+        * ``source`` is a pure function: serialize source and
+          call function with ``**kwargs``, adding a
+          ``channel`` object to the keyword arguments.
+        * ``source`` is a pure module: execute source of module
+          with a ``channel`` in its global namespace
+
+        In all cases the binding ``__name__='__channelexec__'``
+        will be available in the global namespace of the remotely
+        executing code.
         """
         call_name = None
         file_name = None

execnet/gateway_base.py

@@ -187,9 +187,9 @@ def PopenPiped(self, args):
 
 
 class Reply(object):
-    """ reply instances provide access to the result
-        of a function execution that got dispatched
-        through WorkerPool.spawn()
+    """reply instances provide access to the result
+    of a function execution that got dispatched
+    through WorkerPool.spawn()
     """
 
     def __init__(self, task, threadmodel):
@@ -198,10 +198,10 @@ def __init__(self, task, threadmodel):
         self.running = True
 
     def get(self, timeout=None):
-        """ get the result object from an asynchronous function execution.
-            if the function execution raised an exception,
-            then calling get() will reraise that exception
-            including its traceback.
+        """get the result object from an asynchronous function execution.
+        if the function execution raised an exception,
+        then calling get() will reraise that exception
+        including its traceback.
         """
         self.waitfinish(timeout)
         try:
@@ -228,14 +228,14 @@ def run(self):
 
 
 class WorkerPool(object):
-    """ A WorkerPool allows to spawn function executions
-        to threads, returning a reply object on which you
-        can ask for the result (and get exceptions reraised).
-
-        This implementation allows the main thread to integrate
-        itself into performing function execution through
-        calling integrate_as_primary_thread() which will return
-        when the pool received a trigger_shutdown().
+    """A WorkerPool allows to spawn function executions
+    to threads, returning a reply object on which you
+    can ask for the result (and get exceptions reraised).
+
+    This implementation allows the main thread to integrate
+    itself into performing function execution through
+    calling integrate_as_primary_thread() which will return
+    when the pool received a trigger_shutdown().
     """
 
     def __init__(self, execmodel, hasprimary=False):
@@ -253,7 +253,7 @@ def __init__(self, execmodel, hasprimary=False):
             self._primary_thread_task_ready = None
 
     def integrate_as_primary_thread(self):
-        """ integrate the thread with which we are called as a primary
+        """integrate the thread with which we are called as a primary
         thread for executing functions triggered with spawn().
         """
         assert self.execmodel.backend == "thread", self.execmodel
@@ -303,8 +303,8 @@ def _try_send_to_primary_thread(self, reply):
         return False
 
     def spawn(self, func, *args, **kwargs):
-        """ return Reply object for the asynchronous dispatch
-            of the given func(*args, **kwargs).
+        """return Reply object for the asynchronous dispatch
+        of the given func(*args, **kwargs).
         """
         reply = Reply((func, args, kwargs), self.execmodel)
         with self._running_lock:
@@ -572,14 +572,14 @@ def _trace(self, *msg):
         self.gateway._trace(self.id, *msg)
 
     def setcallback(self, callback, endmarker=NO_ENDMARKER_WANTED):
-        """ set a callback function for receiving items.
-
-            All already queued items will immediately trigger the callback.
-            Afterwards the callback will execute in the receiver thread
-            for each received data item and calls to ``receive()`` will
-            raise an error.
-            If an endmarker is specified the callback will eventually
-            be called with the endmarker when the channel closes.
+        """set a callback function for receiving items.
+
+        All already queued items will immediately trigger the callback.
+        Afterwards the callback will execute in the receiver thread
+        for each received data item and calls to ``receive()`` will
+        raise an error.
+        If an endmarker is specified the callback will eventually
+        be called with the endmarker when the channel closes.
         """
         _callbacks = self.gateway._channelfactory._callbacks
         with self.gateway._receivelock:
@@ -650,15 +650,15 @@ def _getremoteerror(self):
     # public API for channel objects
     #
     def isclosed(self):
-        """ return True if the channel is closed. A closed
-            channel may still hold items.
+        """return True if the channel is closed. A closed
+        channel may still hold items.
         """
         return self._closed
 
     def makefile(self, mode="w", proxyclose=False):
-        """ return a file-like object.
-            mode can be 'w' or 'r' for writeable/readable files.
-            if proxyclose is true file.close() will also close the channel.
+        """return a file-like object.
+        mode can be 'w' or 'r' for writeable/readable files.
+        if proxyclose is true file.close() will also close the channel.
         """
         if mode == "w":
             return ChannelFileWrite(channel=self, proxyclose=proxyclose)
@@ -667,10 +667,10 @@ def makefile(self, mode="w", proxyclose=False):
         raise ValueError("mode {!r} not availabe".format(mode))
 
     def close(self, error=None):
-        """ close down this channel with an optional error message.
-            Note that closing of a channel tied to remote_exec happens
-            automatically at the end of execution and cannot
-            be done explicitely.
+        """close down this channel with an optional error message.
+        Note that closing of a channel tied to remote_exec happens
+        automatically at the end of execution and cannot
+        be done explicitely.
         """
         if self._executing:
             raise IOError("cannot explicitly close channel within remote_exec")
@@ -699,7 +699,7 @@ def close(self, error=None):
             self.gateway._channelfactory._no_longer_opened(self.id)
 
     def waitclose(self, timeout=None):
-        """ wait until this channel is closed (or the remote side
+        """wait until this channel is closed (or the remote side
         otherwise signalled that no more data was being sent).
         The channel may still hold receiveable items, but not receive
         any more after waitclose() has returned.  Exceptions from executing
@@ -1319,7 +1319,7 @@ def _buildopcodes():
 
 
 def dumps(obj):
-    """ return a serialized bytestring of the given obj.
+    """return a serialized bytestring of the given obj.
 
     The obj and all contained objects must be of a builtin
     python type (so nested dicts, sets, etc. are all ok but
@@ -1334,7 +1334,7 @@ def dump(byteio, obj):
 
 
 def loads(bytestring, py2str_as_py3str=False, py3str_as_py2str=False):
-    """ return the object as deserialized from the given bytestring.
+    """return the object as deserialized from the given bytestring.
 
     py2str_as_py3str: if true then string (str) objects previously
                       dumped on Python2 will be loaded as Python3
@@ -1354,7 +1354,7 @@ def loads(bytestring, py2str_as_py3str=False, py3str_as_py2str=False):
 
 
 def load(io, py2str_as_py3str=False, py3str_as_py2str=False):
-    """ derserialize an object form the specified stream.
+    """derserialize an object form the specified stream.
 
     Behaviour and parameters are otherwise the same as with ``loads``
     """

execnet/gateway_io.py

@@ -142,7 +142,7 @@ def create_io(spec, execmodel):
 
 
 class ProxyIO(object):
-    """ A Proxy IO object allows to instantiate a Gateway
+    """A Proxy IO object allows to instantiate a Gateway
     through another "via" gateway.  A master:ProxyIO object
     provides an IO object effectively connected to the sub
     via the forwarder.  To achieve this, master:ProxyIO interacts

execnet/gateway_socket.py

@@ -54,8 +54,8 @@ def kill(self):
 
 
 def start_via(gateway, hostport=None):
-    """ return a host, port tuple,
-        after instanciating a socketserver on the given gateway
+    """return a host, port tuple,
+    after instanciating a socketserver on the given gateway
     """
     if hostport is None:
         host, port = ("localhost", 0)

execnet/multi.py

@@ -25,7 +25,7 @@ class Group(object):
     defaultspec = "popen"
 
     def __init__(self, xspecs=(), execmodel="thread"):
-        """ initialize group and make gateways as specified.
+        """initialize group and make gateways as specified.
         execmodel can be 'thread' or 'eventlet'.
         """
         self._gateways = []
@@ -51,7 +51,7 @@ def remote_execmodel(self):
         return self._remote_execmodel
 
     def set_execmodel(self, execmodel, remote_execmodel=None):
-        """ Set the execution model for local and remote site.
+        """Set the execution model for local and remote site.
 
         execmodel can be one of "thread" or "eventlet" (XXX gevent).
         It determines the execution model for any newly created gateway.
@@ -188,7 +188,7 @@ def _cleanup_atexit(self):
         self.terminate(timeout=1.0)
 
     def terminate(self, timeout=None):
-        """ trigger exit of member gateways and wait for termination
+        """trigger exit of member gateways and wait for termination
         of member gateways and associated subprocesses.  After waiting
         timeout seconds try to to kill local sub processes of popen-
         and ssh-gateways.  Timeout defaults to None meaning
@@ -223,8 +223,8 @@ def kill(gw):
             self._gateways_to_join[:] = []
 
     def remote_exec(self, source, **kwargs):
-        """ remote_exec source on all member gateways and return
-            MultiChannel connecting to all sub processes.
+        """remote_exec source on all member gateways and return
+        MultiChannel connecting to all sub processes.
         """
         channels = []
         for gw in self: