From ba4dc2a26bdbc4f371b506b319c6fe66d462a22f Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Thu, 17 Nov 2011 15:33:22 -0800
Subject: [PATCH] Don't mix tabs and spaces

(cherry picked from commit 8c8d0a81ad41a5a4040823049f6548f07ac531b3)
---
 paramiko/server.py    | 19 ++++++++++---------
 paramiko/transport.py | 24 +++++++++++++-----------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/paramiko/server.py b/paramiko/server.py
index 2a1172a..dac9bf1 100644
--- a/paramiko/server.py
+++ b/paramiko/server.py
@@ -496,17 +496,18 @@ class ServerInterface (object):
 
     def check_channel_forward_agent_request(self, channel):
         """
-	Determine if the client will be provided with an forward agent session. If this
-	method returns C{True}, the server will allow SSH Agent forwarding.
+        Determine if the client will be provided with an forward agent session.
+        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
-	@type channel: L{Channel}
-	@return: C{True} if the AgentForward was loaded; C{False} if not
-	@rtype: bool
-	"""
-	return False
+        @param channel: the L{Channel} the request arrived on
+        @type channel: L{Channel}
+        @return: C{True} if the AgentForward was loaded; C{False} if not
+        @rtype: bool
+        """
+        return False
 
     def check_channel_direct_tcpip_request(self, chanid, origin, destination):
         """
diff --git a/paramiko/transport.py b/paramiko/transport.py
index 42a371f..41507a2 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -673,18 +673,20 @@ class Transport (threading.Thread):
             prematurely
         """
         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
-	     prematurely
-	 """
-         return self.open_channel('auth-agent@openssh.com')
+    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
+            prematurely
+        """
+        return self.open_channel('auth-agent@openssh.com')
 
     def open_forwarded_tcpip_channel(self, (src_addr, src_port), (dest_addr, dest_port)):
         """