diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2018-03-12 17:46:53 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2018-03-12 17:46:53 -0700 |
| commit | 58b0dbc206e74ce0d76ca7a2afa109d73dc1bfbf (patch) | |
| tree | 733265ec6c8d0d852d53e38984e8e5fb7fe539a2 | |
| parent | ddf38084317a9f852ae3bdf715e6645b4ba6004d (diff) | |
| parent | 4dfa0728ec16d0bd02f8c330cfcc54c27a46f063 (diff) | |
Merge branch '2.1' into 2.2
| -rw-r--r-- | paramiko/transport.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py index 603570d9..7fe34d40 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -1791,9 +1791,9 @@ class Transport(threading.Thread, ClosingContextManager): Otherwise (client mode, authed, or pre-auth message) returns None. """ if ( - not self.server_mode - or ptype <= HIGHEST_USERAUTH_MESSAGE_ID - or self.is_authenticated() + not self.server_mode or + ptype <= HIGHEST_USERAUTH_MESSAGE_ID or + self.is_authenticated() ): return None # WELP. We must be dealing with someone trying to do non-auth things @@ -1804,7 +1804,7 @@ class Transport(threading.Thread, ClosingContextManager): reply.add_byte(cMSG_REQUEST_FAILURE) # Channel opens let us reject w/ a specific type + message. elif ptype == MSG_CHANNEL_OPEN: - kind = message.get_text() + kind = message.get_text() # noqa chanid = message.get_int() reply.add_byte(cMSG_CHANNEL_OPEN_FAILURE) reply.add_int(chanid) |