From 8dd0a5f772a43886f72182478a3bc54ebd2f4fbf Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Sat, 12 Aug 2017 21:48:05 -0700
Subject: [PATCH] dictutil: remove unused move, subtract, del_if_present

---
 src/allmydata/test/test_util.py | 34 ---------------------------------
 src/allmydata/util/dictutil.py  | 30 -----------------------------
 2 files changed, 64 deletions(-)

diff --git a/src/allmydata/test/test_util.py b/src/allmydata/test/test_util.py
index 14709ec4c..b264dedfa 100644
--- a/src/allmydata/test/test_util.py
+++ b/src/allmydata/test/test_util.py
@@ -1431,40 +1431,6 @@ class DictUtil(unittest.TestCase):
         self.failUnlessEqual(ds[3], set(["f", "g"]))
         self.failUnlessEqual(ds[4], set(["h"]))
 
-    def test_move(self):
-        d1 = {1: "a", 2: "b"}
-        d2 = {2: "c", 3: "d"}
-        dictutil.move(1, d1, d2)
-        self.failUnlessEqual(d1, {2: "b"})
-        self.failUnlessEqual(d2, {1: "a", 2: "c", 3: "d"})
-
-        d1 = {1: "a", 2: "b"}
-        d2 = {2: "c", 3: "d"}
-        dictutil.move(2, d1, d2)
-        self.failUnlessEqual(d1, {1: "a"})
-        self.failUnlessEqual(d2, {2: "b", 3: "d"})
-
-        d1 = {1: "a", 2: "b"}
-        d2 = {2: "c", 3: "d"}
-        self.failUnlessRaises(KeyError, dictutil.move, 5, d1, d2, strict=True)
-
-    def test_subtract(self):
-        d1 = {1: "a", 2: "b"}
-        d2 = {2: "c", 3: "d"}
-        d3 = dictutil.subtract(d1, d2)
-        self.failUnlessEqual(d3, {1: "a"})
-
-        d1 = {1: "a", 2: "b", 3: "c"}
-        d2 = {2: "c", 4: "d"}
-        d3 = dictutil.subtract(d1, d2)
-        self.failUnlessEqual(d3, {1: "a", 3: "c"})
-
-    def test_del_if_present(self):
-        d = {1: "a", 2: "b"}
-        dictutil.del_if_present(d, 1)
-        dictutil.del_if_present(d, 3)
-        self.failUnlessEqual(d, {2: "b"})
-
     def test_auxdict(self):
         d = dictutil.AuxValueDict()
         # we put the serialized form in the auxdata
diff --git a/src/allmydata/util/dictutil.py b/src/allmydata/util/dictutil.py
index bbc28cde9..d59e60dd6 100644
--- a/src/allmydata/util/dictutil.py
+++ b/src/allmydata/util/dictutil.py
@@ -2,32 +2,6 @@
 Tools to mess with dicts.
 """
 
-def move(k, d1, d2, strict=False):
-    """
-    Move item with key k from d1 to d2.
-    """
-    if strict and not d1.has_key(k):
-        raise KeyError, k
-
-    d2[k] = d1[k]
-    del d1[k]
-
-def subtract(d1, d2):
-    """
-    Remove all items from d1 whose key occurs in d2.
-
-    @returns d1
-    """
-    if len(d1) > len(d2):
-        for k in d2.keys():
-            if d1.has_key(k):
-                del d1[k]
-    else:
-        for k in d1.keys():
-            if d2.has_key(k):
-                del d1[k]
-    return d1
-
 class DictOfSets(dict):
     def add(self, key, value):
         if key in self:
@@ -49,10 +23,6 @@ class DictOfSets(dict):
         if not self[key]:
             del self[key]
 
-def del_if_present(d, k):
-    if d.has_key(k):
-        del d[k]
-
 class AuxValueDict(dict):
     """I behave like a regular dict, but each key is associated with two
     values: the main value, and an auxilliary one. Setting the main value