From 611d52b187b3db516e25461aa7e151a28f94b18e Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 24 Jan 2023 16:26:16 -0500 Subject: Harmonize into *args from *larg, *largs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Initially spotted since 'larg' was picked up by codespell as something possibly to fix to become 'large'. But realized that it is just an inconsistency. Had various uses: ❯ git grep '\*arg\>' | nl 1 paramiko/sftp_client.py: def _request(self, t, *arg): 2 paramiko/sftp_client.py: num = self._async_request(type(None), t, *arg) 3 paramiko/sftp_client.py: def _async_request(self, fileobj, t, *arg): 4 paramiko/sftp_server.py: def _response(self, request_number, t, *arg): ❯ git grep '\*largs\>' | nl 1 paramiko/sftp_server.py: *largs, 2 paramiko/sftp_server.py: self.server = sftp_si(server, *largs, **kwargs) 3 paramiko/sftp_si.py: def __init__(self, server, *largs, **kwargs): 4 paramiko/sftp_si.py: super().__init__(*largs, **kwargs) ❯ git grep '\*larg\>' | nl 1 paramiko/server.py: handler = handler_class(channel, name, self, *larg, **kwarg) 2 paramiko/transport.py: def set_subsystem_handler(self, name, handler, *larg, **kwarg): in addition to more conventional ❯ git grep '\*args\>' | nl 1 paramiko/_winapi.py: super().__init__(*args) 2 paramiko/_winapi.py: def __init__(self, *args, **kwargs): 3 paramiko/_winapi.py: super().__init__(*args, **kwargs) 4 paramiko/auth_handler.py: def _log(self, *args): 5 paramiko/auth_handler.py: return self.transport._log(*args) 6 paramiko/channel.py: def _check(self, *args, **kwds): 7 paramiko/channel.py: return func(self, *args, **kwds) 8 paramiko/channel.py: def _log(self, level, msg, *args): 9 paramiko/channel.py: self.logger.log(level, "[chan " + self._name + "] " + msg, *args) 10 paramiko/sftp.py: def _log(self, level, msg, *args): 11 paramiko/sftp.py: self.logger.log(level, msg, *args) 12 paramiko/sftp_client.py: def _log(self, level, msg, *args): 13 paramiko/sftp_client.py: self._log(level, m, *args) 14 paramiko/transport.py: def _log(self, level, msg, *args): 15 paramiko/transport.py: self.logger.log(level, msg, *args) 16 tests/__init__.py: def _test_under_locale(testself, *args, **kwargs): 17 tests/__init__.py: return test_method(testself, *args, **kwargs) 18 tests/test_client.py: def __init__(self, *args, **kwargs): 19 tests/test_client.py: super().__init__(*args, **kwargs) 20 tests/test_config.py: def inner(command, *args, **kwargs): 21 tests/test_packetizer.py: def wrapper(*args, **kwargs): 22 tests/test_packetizer.py: result = func(*args, **kwargs) --- paramiko/server.py | 4 ++-- paramiko/sftp_client.py | 8 ++++---- paramiko/sftp_server.py | 8 ++++---- paramiko/sftp_si.py | 4 ++-- paramiko/transport.py | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/paramiko/server.py b/paramiko/server.py index b68607e1..a0a01fec 100644 --- a/paramiko/server.py +++ b/paramiko/server.py @@ -454,10 +454,10 @@ class ServerInterface: subsystem; ``False`` if that subsystem can't or won't be provided. """ transport = channel.get_transport() - handler_class, larg, kwarg = transport._get_subsystem_handler(name) + handler_class, args, kwargs = transport._get_subsystem_handler(name) if handler_class is None: return False - handler = handler_class(channel, name, self, *larg, **kwarg) + handler = handler_class(channel, name, self, *args, **kwargs) handler.start() return True diff --git a/paramiko/sftp_client.py b/paramiko/sftp_client.py index d91a3951..31ac1292 100644 --- a/paramiko/sftp_client.py +++ b/paramiko/sftp_client.py @@ -817,17 +817,17 @@ class SFTPClient(BaseSFTP, ClosingContextManager): # ...internals... - def _request(self, t, *arg): - num = self._async_request(type(None), t, *arg) + def _request(self, t, *args): + num = self._async_request(type(None), t, *args) return self._read_response(num) - def _async_request(self, fileobj, t, *arg): + def _async_request(self, fileobj, t, *args): # this method may be called from other threads (prefetch) self._lock.acquire() try: msg = Message() msg.add_int(self.request_number) - for item in arg: + for item in args: if isinstance(item, int64): msg.add_int64(item) elif isinstance(item, int): diff --git a/paramiko/sftp_server.py b/paramiko/sftp_server.py index 6cb7ec62..3bae415d 100644 --- a/paramiko/sftp_server.py +++ b/paramiko/sftp_server.py @@ -98,7 +98,7 @@ class SFTPServer(BaseSFTP, SubsystemHandler): name, server, sftp_si=SFTPServerInterface, - *largs, + *args, **kwargs ): """ @@ -124,7 +124,7 @@ class SFTPServer(BaseSFTP, SubsystemHandler): # map of handle-string to SFTPHandle for files & folders: self.file_table = {} self.folder_table = {} - self.server = sftp_si(server, *largs, **kwargs) + self.server = sftp_si(server, *args, **kwargs) def _log(self, level, msg): if issubclass(type(msg), list): @@ -221,10 +221,10 @@ class SFTPServer(BaseSFTP, SubsystemHandler): # ...internals... - def _response(self, request_number, t, *arg): + def _response(self, request_number, t, *args): msg = Message() msg.add_int(request_number) - for item in arg: + for item in args: # NOTE: this is a very silly tiny class used for SFTPFile mostly if isinstance(item, int64): msg.add_int64(item) diff --git a/paramiko/sftp_si.py b/paramiko/sftp_si.py index 26b0ac9b..72b5db94 100644 --- a/paramiko/sftp_si.py +++ b/paramiko/sftp_si.py @@ -40,7 +40,7 @@ class SFTPServerInterface: clients & servers obey the requirement that paths be encoded in UTF-8. """ - def __init__(self, server, *largs, **kwargs): + def __init__(self, server, *args, **kwargs): """ Create a new SFTPServerInterface object. This method does nothing by default and is meant to be overridden by subclasses. @@ -48,7 +48,7 @@ class SFTPServerInterface: :param .ServerInterface server: the server object associated with this channel and SFTP subsystem """ - super().__init__(*largs, **kwargs) + super().__init__(*args, **kwargs) def session_started(self): """ diff --git a/paramiko/transport.py b/paramiko/transport.py index 2b6acd6e..9436111b 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -1415,7 +1415,7 @@ class Transport(threading.Thread, ClosingContextManager): finally: self.lock.release() - def set_subsystem_handler(self, name, handler, *larg, **kwarg): + def set_subsystem_handler(self, name, handler, *args, **kwargs): """ Set the handler class for a subsystem in server mode. If a request for this subsystem is made on an open ssh channel later, this handler @@ -1431,7 +1431,7 @@ class Transport(threading.Thread, ClosingContextManager): """ try: self.lock.acquire() - self.subsystem_table[name] = (handler, larg, kwarg) + self.subsystem_table[name] = (handler, args, kwargs) finally: self.lock.release() -- cgit v1.2.1