Don't mix tabs and spaces

(cherry picked from commit 8c8d0a81ad)
This commit is contained in:
Jeff Forcier 2011-11-17 15:33:22 -08:00
parent a84bd27bfd
commit ba4dc2a26b
2 changed files with 23 additions and 20 deletions

View File

@ -496,17 +496,18 @@ class ServerInterface (object):
def check_channel_forward_agent_request(self, channel): def check_channel_forward_agent_request(self, channel):
""" """
Determine if the client will be provided with an forward agent session. If this Determine if the client will be provided with an forward agent session.
method returns C{True}, the server will allow SSH Agent forwarding. If this method returns C{True}, the server will allow SSH Agent
forwarding.
The default implementation always returns C{False}. The default implementation always returns C{False}.
@param channel: the L{Channel} the request arrived on @param channel: the L{Channel} the request arrived on
@type channel: L{Channel} @type channel: L{Channel}
@return: C{True} if the AgentForward was loaded; C{False} if not @return: C{True} if the AgentForward was loaded; C{False} if not
@rtype: bool @rtype: bool
""" """
return False return False
def check_channel_direct_tcpip_request(self, chanid, origin, destination): def check_channel_direct_tcpip_request(self, chanid, origin, destination):
""" """

View File

@ -673,18 +673,20 @@ class Transport (threading.Thread):
prematurely prematurely
""" """
return self.open_channel('x11', src_addr=src_addr) return self.open_channel('x11', src_addr=src_addr)
def open_forward_agent_channel(self):
"""
Request a new channel to the client, of type C{"auth-agent@openssh.com"}.
This is just an alias for C{open_channel('auth-agent@openssh.com')}.
@return: a new L{Channel}
@rtype: L{Channel}
@raise SSHException: if the request is rejected or the session ends def open_forward_agent_channel(self):
prematurely """
""" Request a new channel to the client, of type
return self.open_channel('auth-agent@openssh.com') C{"auth-agent@openssh.com"}.
This is just an alias for C{open_channel('auth-agent@openssh.com')}.
@return: a new L{Channel}
@rtype: L{Channel}
@raise SSHException: if the request is rejected or the session ends
prematurely
"""
return self.open_channel('auth-agent@openssh.com')
def open_forwarded_tcpip_channel(self, (src_addr, src_port), (dest_addr, dest_port)): def open_forwarded_tcpip_channel(self, (src_addr, src_port), (dest_addr, dest_port)):
""" """