# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dwayne@oscl.ca-20071206194213-5p8f62gva4i6v9us
# target_branch: http://www.lag.net/paramiko/bzr/paramiko/
# testament_sha1: dd8f0633588ee0719fd71370eb18394f419bb76b
# timestamp: 2007-12-06 13:47:47 -0600
# base_revision_id: robey@lag.net-20071120052527-hloi0b30yngbay0x
# 
# Begin patch
=== modified file 'paramiko/client.py'
--- paramiko/client.py	2007-11-10 06:52:22 +0000
+++ paramiko/client.py	2007-12-06 19:42:13 +0000
@@ -299,7 +299,7 @@
         self._transport.close()
         self._transport = None
 
-    def exec_command(self, command):
+    def exec_command(self, command, bufsize=-1):
         """
         Execute a command on the SSH server.  A new L{Channel} is opened and
         the requested command is executed.  The command's input and output
@@ -308,6 +308,8 @@
         
         @param command: the command to execute
         @type command: str
+        @param bufsize: interpreted the same way as by the built-in C{file()} function in python
+        @type bufsize: int
         @return: the stdin, stdout, and stderr of the executing command
         @rtype: tuple(L{ChannelFile}, L{ChannelFile}, L{ChannelFile})
 
@@ -315,9 +317,9 @@
         """
         chan = self._transport.open_session()
         chan.exec_command(command)
-        stdin = chan.makefile('wb')
-        stdout = chan.makefile('rb')
-        stderr = chan.makefile_stderr('rb')
+        stdin = chan.makefile('wb', bufsize)
+        stdout = chan.makefile('rb', bufsize)
+        stderr = chan.makefile_stderr('rb', bufsize)
         return stdin, stdout, stderr
 
     def invoke_shell(self, term='vt100', width=80, height=24):

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfKJifwAAcJfgEQQUef//39E
WAC/7//6UAP5Jpem7mZmZtuElEaGiaMp5GCTaap4ptEDR6TPUjIGglKm2gmmKn6U09JkaaAAAAAG
gEkJNJhTanlT2k0zQSaNGg02poB6QNBzAATJgATCYJhDAEYAEkkKfqaam9ExBlNGEGT1AAANDRAs
TZq5Wx9dXIpx0/bNqapUDK5qpSiQiiB82zZRmuEExcuNWg47WZgu+i0SnhIgeHRzEFE628Mdf82q
X4d7veoJPF3nU/21x7hzmamQsT3tHRtKIaf727dr7OcNebINaGurgSHT7s9XmoOa2QqCtq4Yxdad
bPUThpFa8xFwTvzllpJ+KU9y8UOsTXK7T3ooFc1rd3MPv3TJiZhF0GFJA1BMdExNMYQ0hhuxbDpJ
kZ1UrFwriF3KM5C6Y8uZQLc0FRUS3YrjqJ3kmnFa2ZLfwMW9eI/iRWOSLDCx6WcwqktAJhUl4ool
PCscmELMy9BmKQqFZWECZ1QmRAw2XSWk6jExcusLicCwUdEbaIpUYVNCZITIlSAmWmQ1aEVolqZS
iKKxYXxUudeL4wnGoCcpjcGEeShesUKS2UrKGjOJhBIvEL5mKSSGxdBzy4sKsKY7myHnyJMgQGjh
LiZY2NheaROuRXXdEZaipsosSQOzhf1F7C+DGKz6GpOHPBV1sQxG/wMsok5SzxJDpfEzvnYmGf4o
5Pc39QtGtovxv2Zd9P1hKK1a0G6/lG4ddGkxwMaRRkDQYtm7WZ36i5FBkDyWN0VY6qlO3lNMBYRL
dsTAXPHRGxGscdizlpP2iy98AOQUxmlOstKGXel5aTPrtUPrSu9zeubNT77By4vYdOmK0csD7595
uGOjtvL01k+HU3V1wmTdto3mXUaCZW2YbgQlPaXzOBlhPRy9dR2vn6FsuWa3xVdYO+CYjqkimOx7
YS8HkqsRKgy4yKUUVxb3G0WswJzxjPblpgxpgXYlubkiNMKv5G8xTlgMsZL6p0Ea07EKVb9yMgSG
YsypVRlUmB2gIOg3vZHFVKyWkDB+RAT4jKqQzRJSLaiEsv3QqcfYp7SzVPzq5bFCq9umslPUD7h5
JhoTpdBfFTFAN85slaiTrJ6RMMmZDLP05c6PJsF5aQ2PQc4kPCVc2q9KnLMVtjvRuGGCiLZQ0Yap
JBl6lnuiwY0JQgO77m/KEWmfjo0sUE0X+bJoXSvowudOEaHsMqy+wXRvGagg9LnmUxxAcInNeXLf
W2Rh6Oi655o9Lh4cSCZKRehp2yLyljfhtIOxqwpFJlU04N47wNlLJOgtHeJwplSBP4TJcPDFhEbW
K2qzqxRip/NcIqgQRXMwAzLY/s0/4u5IpwoSHlExP4A=