diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2018-03-12 17:46:54 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2018-03-12 17:46:54 -0700 |
| commit | 1cd44d6950168654031cc7e4521047ecc23344a5 (patch) | |
| tree | 533f31b39b2ab5444752025e7fe00d10e4a91f46 | |
| parent | c7110594d68897a072c02f6f7bed14844836998c (diff) | |
| parent | a66391d3bad70e4b8d0b1fb84b3c21389049688a (diff) | |
Merge branch '2.4'
| -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 a99e077d..ddcb2912 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -1842,9 +1842,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 @@ -1855,7 +1855,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) |