Fix some potential bugs (in non-test code) exposed by check-miscaptures.py. refs...

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / mutable / filenode.py

diff --git a/src/allmydata/mutable/filenode.py b/src/allmydata/mutable/filenode.py
index 02f99b645cc6125080399d8f80106e440e2ffb62..612e7c77603ba98a746255adbc7362a6de2c5406 100644 (file)
--- a/src/allmydata/mutable/filenode.py
+++ b/src/allmydata/mutable/filenode.py
@@ -118,17 +118,6 @@ class MutableFileNode:
         self._privkey = None
         self._encprivkey = None
 
-        # Starting with MDMF caps, we allowed arbitrary extensions in
-        # caps. If we were initialized with a cap that had extensions,
-        # we want to remember them so we can tell MutableFileVersions
-        # about them.
-        extensions = self._uri.get_extension_params()
-        if extensions:
-            extensions = map(int, extensions)
-            suspected_k, suspected_segsize = extensions
-            self._downloader_hints['k'] = suspected_k
-            self._downloader_hints['segsize'] = suspected_segsize
-
         return self
 
     def create_with_keys(self, (pubkey, privkey), contents,
@@ -701,9 +690,6 @@ class MutableFileNode:
 
     def set_downloader_hints(self, hints):
         self._downloader_hints = hints
-        extensions = [ hints["k"], hints["segsize"] ]
-        self._uri.set_extension_params(extensions)
-
 
     def _did_upload(self, res, size):
         self._most_recent_size = size
@@ -1150,14 +1136,14 @@ class MutableFileVersion:
         start_segments = {} # shnum -> start segment
         end_segments = {} # shnum -> end segment
         blockhashes = {} # shnum -> blockhash tree
-        for (shnum, data) in update_data.iteritems():
-            data = [d[1] for d in data if d[0] == self._version]
+        for (shnum, original_data) in update_data.iteritems():
+            data = [d[1] for d in original_data if d[0] == self._version]
 
             # Every data entry in our list should now be share shnum for
             # a particular version of the mutable file, so all of the
             # entries should be identical.
             datum = data[0]
-            assert filter(lambda x: x != datum, data) == []
+            assert [x for x in data if x != datum] == []
 
             blockhashes[shnum] = datum[0]
             start_segments[shnum] = datum[1]