[pypy-commit] pypy set-strategies: renamed delitem to remove

[l.diekmann]

Author: Lukas Diekmann <lukas.diekmann at uni-duesseldorf.de>
Branch: set-strategies
Changeset: r49213:4e50f659baaf
Date: 2011-10-11 13:55 +0200
http://bitbucket.org/pypy/pypy/changeset/4e50f659baaf/

Log:	renamed delitem to remove

diff --git a/pypy/objspace/std/setobject.py b/pypy/objspace/std/setobject.py
--- a/pypy/objspace/std/setobject.py
+++ b/pypy/objspace/std/setobject.py
@@ -78,10 +78,8 @@
     def add(self, w_key):
         self.strategy.add(self, w_key)
 
-    # XXX rename to "remove", delitem is the name for the operation that does
-    # "del d[x]" which does not work on sets
-    def delitem(self, w_item):
-        return self.strategy.delitem(self, w_item)
+    def remove(self, w_item):
+        return self.strategy.remove(self, w_item)
 
     def getdict_w(self):
         return self.strategy.getdict_w(self)
@@ -223,7 +221,7 @@
         w_set.sstorage = strategy.get_empty_storage()
         w_set.add(w_key)
 
-    def delitem(self, w_set, w_item):
+    def remove(self, w_set, w_item):
         return False
 
     def discard(self, w_set, w_item):
@@ -345,7 +343,7 @@
             w_set.switch_to_object_strategy(self.space)
             w_set.add(w_key)
 
-    def delitem(self, w_set, w_item):
+    def remove(self, w_set, w_item):
         from pypy.objspace.std.dictmultiobject import _never_equal_to_string
         d = self.cast_from_void_star(w_set.sstorage)
         if not self.is_correct_type(w_item):
@@ -354,7 +352,7 @@
             if _never_equal_to_string(self.space, self.space.type(w_item)):
                 return False
             w_set.switch_to_object_strategy(self.space)
-            return w_set.delitem(w_item)
+            return w_set.remove(w_item)
 
         key = self.unwrap(w_item)
         try:
@@ -918,7 +916,7 @@
         else:
             for w_key in space.listview(w_other):
                 space.hash(w_key)
-                w_left.delitem(w_key)
+                w_left.remove(w_key)
 
 def inplace_sub__Set_Set(space, w_left, w_other):
     w_left.difference_update(w_other)
@@ -1073,7 +1071,7 @@
     Returns True if successfully removed.
     """
     try:
-        deleted = w_left.delitem(w_item)
+        deleted = w_left.remove(w_item)
     except OperationError, e:
         if not e.match(space, space.w_TypeError):
             raise
@@ -1081,7 +1079,7 @@
             w_f = _convert_set_to_frozenset(space, w_item)
             if w_f is None:
                 raise
-            deleted = w_left.delitem(w_f)
+            deleted = w_left.remove(w_f)
 
     if w_left.length() == 0:
         w_left.switch_to_empty_strategy()