diff options
| -rw-r--r-- | paramiko/pkey.py | 1 | ||||
| -rw-r--r-- | paramiko/transport.py | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/paramiko/pkey.py b/paramiko/pkey.py index 32d8cad5..cbb5b3ff 100644 --- a/paramiko/pkey.py +++ b/paramiko/pkey.py @@ -278,6 +278,7 @@ class PKey: :raises: ``IOError`` -- if there was an error writing to the file :raises: `.SSHException` -- if the key is invalid """ + # TODO 4.0: NotImplementedError (plus everywhere else in here) raise Exception("Not implemented in PKey") def _read_private_key_file(self, tag, filename, password=None): diff --git a/paramiko/transport.py b/paramiko/transport.py index 98cdae03..c4d7efd1 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -413,6 +413,8 @@ class Transport(threading.Thread, ClosingContextManager): self.hostname = None self.server_extensions = {} + # TODO: these two overrides on sock's type should go away sometime, too + # many ways to do it! if isinstance(sock, str): # convert "host:port" into (host, port) hl = sock.split(":", 1) @@ -1865,6 +1867,8 @@ class Transport(threading.Thread, ClosingContextManager): # internals... + # TODO 4.0: make a public alias for this because multiple other classes + # already explicitly rely on it...or just rewrite logging :D def _log(self, level, msg, *args): if issubclass(type(msg), list): for m in msg: @@ -2125,6 +2129,8 @@ class Transport(threading.Thread, ClosingContextManager): ) ) # noqa self._expected_packet = tuple() + # These message IDs indicate key exchange & will differ + # depending on exact exchange algorithm if (ptype >= 30) and (ptype <= 41): self.kex_engine.parse_next(ptype, m) continue |