webapi: handle format=, remove mutable-type=

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / nodemaker.py

diff --git a/src/allmydata/nodemaker.py b/src/allmydata/nodemaker.py
index 5d46d893cadca774ec81423c407376a72a6bd7b1..6fdaf47988f1e813c0be522dbcf63f029f252727 100644 (file)
--- a/src/allmydata/nodemaker.py
+++ b/src/allmydata/nodemaker.py
@@ -109,8 +109,9 @@ class NodeMaker:
             return self._create_dirnode(filenode)
         return None
 
-    def create_mutable_file(self, contents=None, keysize=None,
-                            version=SDMF_VERSION):
+    def create_mutable_file(self, contents=None, keysize=None, version=None):
+        if version is None:
+            version = SDMF_VERSION
         n = MutableFileNode(self.storage_broker, self.secret_holder,
                             self.default_encoding_parameters, self.history)
         d = self.key_generator.generate(keysize)
@@ -118,8 +119,7 @@ class NodeMaker:
         d.addCallback(lambda res: n)
         return d
 
-    def create_new_mutable_directory(self, initial_children={},
-                                     version=SDMF_VERSION):
+    def create_new_mutable_directory(self, initial_children={}, version=None):
         # initial_children must have metadata (i.e. {} instead of None)
         for (name, (node, metadata)) in initial_children.iteritems():
             precondition(isinstance(metadata, dict),