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 | 4dfa0728ec16d0bd02f8c330cfcc54c27a46f063 (patch) | |
| tree | 5d20682cd1771158a26b9ed0274f21fc7286697e | |
| parent | db4011125bd6aeb5116adb2675f6a52c135940bd (diff) | |
| parent | e6791c17a5e9ea00f292c2e2eb43488e9303efe1 (diff) | |
Merge branch '2.0' into 2.1
| -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 39c6eb89..b23cadee 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -1779,9 +1779,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 @@ -1792,7 +1792,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) |