ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-07 10:56:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dictutil.DictOfSets: remove .union() method, it was misleading

Browse Source 
Unlike set.union(), which returns a new set, DictOfSets.union() modified
the DictOfSets in-place. The name collision bit me when I changed some
code from using DictOfSets to a normal set, and expected that
set.union() would modify the set in-place. Since there was only one user
of DictOfSets.union, I figured it was safer to just get rid of it.
This commit is contained in:
Brian Warner 2012-05-16 16:50:57 -07:00
parent 9acf5beebd
commit cc366903ce
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/allmydata/test/test_util.py
View File

@ -1119,16 +1119,13 @@ class DictUtil(unittest.TestCase):
ds.discard(2, "c")
self.failIf(2 in ds)
ds.union(1, ["a", "e"])
ds.union(3, ["f"])
self.failUnlessEqual(ds[1], set(["a","e"]))
self.failUnlessEqual(ds[3], set(["f"]))
ds.add(3, "f")
ds2 = dictutil.DictOfSets()
ds2.add(3, "f")
ds2.add(3, "g")
ds2.add(4, "h")
ds.update(ds2)
self.failUnlessEqual(ds[1], set(["a","e"]))
self.failUnlessEqual(ds[1], set(["a"]))
self.failUnlessEqual(ds[3], set(["f", "g"]))
self.failUnlessEqual(ds[4], set(["h"]))

13
src/allmydata/util/dictutil.py
View File

@ -40,15 +40,12 @@ class DictOfSets(dict):
else:
self[key] = set([value])
def union(self, key, values):
if key in self:
self[key].update(values)
else:
self[key] = set(values)
def update(self, otherdictofsets):
for key, value in otherdictofsets.iteritems():
self.union(key, value)
for key, values in otherdictofsets.iteritems():
if key in self:
self[key].update(values)
else:
self[key] = set(values)
def discard(self, key, value):
if not key in self: