From 2292f94f2687d34b551c0c0294df6d17989b70db Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 16 Jan 2023 19:54:07 -0500 Subject: Punt a bunch of backwards incompatible TODOs to 4.0 --- paramiko/auth_handler.py | 4 ++-- paramiko/config.py | 2 +- paramiko/ssh_exception.py | 6 +++--- paramiko/transport.py | 2 +- tasks.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/paramiko/auth_handler.py b/paramiko/auth_handler.py index 02ab810c..22f506c1 100644 --- a/paramiko/auth_handler.py +++ b/paramiko/auth_handler.py @@ -367,7 +367,7 @@ class AuthHandler: def _parse_service_accept(self, m): service = m.get_text() if service == "ssh-userauth": - # TODO 3.0: this message sucks ass. change it to something more + # TODO 4.0: this message sucks ass. change it to something more # obvious. it always appears to mean "we already authed" but no! it # just means "we are allowed to TRY authing!" self._log(DEBUG, "userauth is OK") @@ -806,7 +806,7 @@ Error Message: {} return # TODO: do the same to the other tables, in Transport. - # TODO 3.0: MAY make sense to make these tables into actual + # TODO 4.0: MAY make sense to make these tables into actual # classes/instances that can be fed a mode bool or whatever. Or, # alternately (both?) make the message types small classes or enums that # embed this info within themselves (which could also then tidy up the diff --git a/paramiko/config.py b/paramiko/config.py index 09be9fcb..b387fca9 100644 --- a/paramiko/config.py +++ b/paramiko/config.py @@ -149,7 +149,7 @@ class SSHConfig: self._config.append(context) context = {"config": {}} if key == "host": - # TODO 3.0: make these real objects or at least name this + # TODO 4.0: make these real objects or at least name this # "hosts" to acknowledge it's an iterable. (Doing so prior # to 3.0, despite it being a private API, feels bad - # surely such an old codebase has folks actually relying on diff --git a/paramiko/ssh_exception.py b/paramiko/ssh_exception.py index 3da49958..9b1b44c3 100644 --- a/paramiko/ssh_exception.py +++ b/paramiko/ssh_exception.py @@ -58,9 +58,9 @@ class BadAuthenticationType(AuthenticationException): allowed_types = [] - # TODO 3.0: remove explanation kwarg + # TODO 4.0: remove explanation kwarg def __init__(self, explanation, types): - # TODO 3.0: remove this supercall unless it's actually required for + # TODO 4.0: remove this supercall unless it's actually required for # pickling (after fixing pickling) AuthenticationException.__init__(self, explanation, types) self.explanation = explanation @@ -140,7 +140,7 @@ class IncompatiblePeer(SSHException): .. versionadded:: 2.9 """ - # TODO 3.0: consider making this annotate w/ 1..N 'missing' algorithms, + # TODO 4.0: consider making this annotate w/ 1..N 'missing' algorithms, # either just the first one that would halt kex, or even updating the # Transport logic so we record /all/ that /could/ halt kex. # TODO: update docstrings where this may end up raised so they are more diff --git a/paramiko/transport.py b/paramiko/transport.py index 247cc1a0..6c14218c 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -3004,7 +3004,7 @@ class Transport(threading.Thread, ClosingContextManager): } -# TODO 3.0: drop this, we barely use it ourselves, it badly replicates the +# TODO 4.0: drop this, we barely use it ourselves, it badly replicates the # Transport-internal algorithm management, AND does so in a way which doesn't # honor newer things like disabled_algorithms! class SecurityOptions: diff --git a/tasks.py b/tasks.py index ae408059..9d2903c8 100644 --- a/tasks.py +++ b/tasks.py @@ -97,7 +97,7 @@ def guard(ctx, opts=""): # Until we stop bundling docs w/ releases. Need to discover use cases first. # TODO: would be nice to tie this into our own version of build() too, but # still have publish() use that build()...really need to try out classes! -# TODO 3.0: I'd like to just axe the 'built docs in sdist', none of my other +# TODO 4.0: I'd like to just axe the 'built docs in sdist', none of my other # projects do it. @task def publish_( -- cgit v1.2.3