SFTP: fix error in SFTPUserHandler arguments introduced by execCommand patch.
authordavid-sarah <david-sarah@jacaranda.org>
Sun, 16 May 2010 01:40:45 +0000 (18:40 -0700)
committerdavid-sarah <david-sarah@jacaranda.org>
Sun, 16 May 2010 01:40:45 +0000 (18:40 -0700)
src/allmydata/frontends/sftpd.py
src/allmydata/test/test_sftp.py

index 5407ebad272433ece64a62e97beded4b22610497..b36d29b8b727ab0265f6e57b1a7c097c709f96a6 100644 (file)
@@ -805,11 +805,10 @@ class Reason:
 
 class SFTPUserHandler(ConchUser, PrefixingLogMixin):
     implements(ISFTPServer, ISession)
-    def __init__(self, check_abort, client, rootnode, username):
+    def __init__(self, client, rootnode, username):
         ConchUser.__init__(self)
         PrefixingLogMixin.__init__(self, facility="tahoe.sftp")
-        if noisy: self.log(".__init__(%r, %r, %r, %r)" %
-                           (check_abort, client, rootnode, username), level=NOISY)
+        if noisy: self.log(".__init__(%r, %r, %r)" % (client, rootnode, username), level=NOISY)
 
         self.channelLookup["session"] = session.SSHSession
         self.subsystemLookup["sftp"] = FileTransferServer
index de0561a99c79c4c225cdc15c79d65be79ee19cfd..418ba09d968d409c1b443a5a493636c629112b62 100644 (file)
@@ -90,7 +90,6 @@ class Handler(GridTestMixin, ShouldFailMixin, unittest.TestCase):
         self.basedir = "sftp/" + basedir
         self.set_up_grid(num_clients=num_clients, num_servers=num_servers)
 
-        self.check_abort = lambda: False
         self.client = self.g.clients[0]
         self.username = "alice"
 
@@ -98,7 +97,7 @@ class Handler(GridTestMixin, ShouldFailMixin, unittest.TestCase):
         def _created_root(node):
             self.root = node
             self.root_uri = node.get_uri()
-            self.handler = sftpd.SFTPUserHandler(self.check_abort, self.client, self.root, self.username)
+            self.handler = sftpd.SFTPUserHandler(self.client, self.root, self.username)
         d.addCallback(_created_root)
         return d