dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12 from bobbyi/whitespace 

Replace hard tabs with spaces
This commit is contained in:
Jeff Forcier 2012-03-10 19:31:24 -08:00
parent ece1a825e8 c07eddb9e1
commit 20390e6ff3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup.py
View File

@ -45,8 +45,8 @@ except ImportError:
kw = {} kw = {}
if sys.platform == 'darwin': if sys.platform == 'darwin':
import setup_helper import setup_helper
setup_helper.install_custom_make_tarball() setup_helper.install_custom_make_tarball()
setup(name = "ssh", setup(name = "ssh",

6
ssh/transport.py
View File

@ -2008,8 +2008,8 @@ class Transport (threading.Thread):
initial_window_size = m.get_int() initial_window_size = m.get_int()
max_packet_size = m.get_int() max_packet_size = m.get_int()
reject = False reject = False
if (kind == 'auth-agent@openssh.com') and (self._forward_agent_handler is not None): if (kind == 'auth-agent@openssh.com') and (self._forward_agent_handler is not None):
self._log(DEBUG, 'Incoming forward agent connection') self._log(DEBUG, 'Incoming forward agent connection')
self.lock.acquire() self.lock.acquire()
try: try:
my_chanid = self._next_channel() my_chanid = self._next_channel()
@ -2087,7 +2087,7 @@ class Transport (threading.Thread):
m.add_int(self.max_packet_size) m.add_int(self.max_packet_size)
self._send_message(m) self._send_message(m)
self._log(INFO, 'Secsh channel %d (%s) opened.', my_chanid, kind) self._log(INFO, 'Secsh channel %d (%s) opened.', my_chanid, kind)
if kind == 'auth-agent@openssh.com': if kind == 'auth-agent@openssh.com':
self._forward_agent_handler(chan) self._forward_agent_handler(chan)
elif kind == 'x11': elif kind == 'x11':
self._x11_handler(chan, (origin_addr, origin_port)) self._x11_handler(chan, (origin_addr, origin_port))