the wait_for_numpeers= argument to client.upload() is optional: make both the code...

diff --git a/src/allmydata/client.py b/src/allmydata/client.py
index 6a30a208e234a7381fb8d4675ceb2734cfbb79d9..fe07ec729bd1c67c0e0e0cf18dd1474d63c33589 100644 (file)
--- a/src/allmydata/client.py
+++ b/src/allmydata/client.py
@@ -293,7 +293,7 @@ class Client(node.Node, Referenceable, testutil.PollMixin):
         assert IMutableFileURI.providedBy(u), u
         return MutableFileNode(self).init_from_uri(u)
 
-    def create_empty_dirnode(self, wait_for_numpeers):
+    def create_empty_dirnode(self, wait_for_numpeers=None):
         n = NewDirectoryNode(self)
         d = n.create(wait_for_numpeers=wait_for_numpeers)
         d.addCallback(lambda res: n)
@@ -305,7 +305,7 @@ class Client(node.Node, Referenceable, testutil.PollMixin):
         d.addCallback(lambda res: n)
         return d
 
-    def upload(self, uploadable, wait_for_numpeers):
+    def upload(self, uploadable, wait_for_numpeers=None):
         uploader = self.getServiceNamed("uploader")
         return uploader.upload(uploadable, wait_for_numpeers=wait_for_numpeers)
 

diff --git a/src/allmydata/interfaces.py b/src/allmydata/interfaces.py
index 42699d42a2973a06f635611edf6ea8f3f57cd445..46f720bc4fc99b55e0b83de2d745839595ee012e 100644 (file)
--- a/src/allmydata/interfaces.py
+++ b/src/allmydata/interfaces.py
@@ -1146,19 +1146,30 @@ class IChecker(Interface):
         """
 
 class IClient(Interface):
-    def upload(uploadable, wait_for_numpeers):
+    def upload(uploadable, wait_for_numpeers=None):
         """Upload some data into a CHK, get back the URI string for it.
         @param uploadable: something that implements IUploadable
         @param wait_for_numpeers: don't upload anything until we have at least
                                   this many peers connected
         @return: a Deferred that fires with the (string) URI for this file.
         """
-    def create_empty_dirnode(wait_for_numpeers):
+
+    def create_mutable_file(contents="", wait_for_numpeers=None):
+        """Create a new mutable file with contents, get back the URI string.
+        @param contents: the initial contents to place in the file.
+        @param wait_for_numpeers: don't upload anything until we have at least
+                                  this many peers connected
+        @return: a Deferred that fires with tne (string) SSK URI for the new
+                 file.
+        """
+
+    def create_empty_dirnode(wait_for_numpeers=None):
         """Create a new dirnode, empty and unattached.
         @param wait_for_numpeers: don't create anything until we have at least
                                   this many peers connected.
         @return: a Deferred that fires with the new IDirectoryNode instance.
         """
+
     def create_node_from_uri(uri):
         """Create a new IFilesystemNode instance from the uri, synchronously.
         @param uri: a string or IURI-providing instance. This could be for a