[pypy-commit] pypy dict-strategies: name consistently

[cfbolz]

Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch: dict-strategies
Changeset: r44549:e7904f828000
Date: 2011-05-27 14:46 +0200
http://bitbucket.org/pypy/pypy/changeset/e7904f828000/

Log:	name consistently

diff --git a/pypy/objspace/std/celldict.py b/pypy/objspace/std/celldict.py
--- a/pypy/objspace/std/celldict.py
+++ b/pypy/objspace/std/celldict.py
@@ -52,8 +52,8 @@
             self.switch_to_object_strategy(w_dict)
             w_dict.setitem(w_key, w_value)
 
-    def setitem_str(self, w_dict, name, w_value):
-        self.getcell(w_dict, name, True).w_value = w_value
+    def setitem_str(self, w_dict, key, w_value):
+        self.getcell(w_dict, key, True).w_value = w_value
 
     def setdefault(self, w_dict, w_key, w_default):
         space = self.space
@@ -93,20 +93,20 @@
                 res += 1
         return res
 
-    def getitem(self, w_dict, w_lookup):
+    def getitem(self, w_dict, w_key):
         space = self.space
-        w_lookup_type = space.type(w_lookup)
+        w_lookup_type = space.type(w_key)
         if space.is_w(w_lookup_type, space.w_str):
-            return self.getitem_str(w_dict, space.str_w(w_lookup))
+            return self.getitem_str(w_dict, space.str_w(w_key))
 
         elif _never_equal_to_string(space, w_lookup_type):
             return None
         else:
             self.switch_to_object_strategy(w_dict)
-            return w_dict.getitem(w_lookup)
+            return w_dict.getitem(w_key)
 
-    def getitem_str(self, w_dict, lookup):
-        res = self.getcell(w_dict, lookup, False)
+    def getitem_str(self, w_dict, key):
+        res = self.getcell(w_dict, key, False)
         if res is None:
             return None
         # note that even if the res.w_value is None, the next line is fine
diff --git a/pypy/objspace/std/dictproxyobject.py b/pypy/objspace/std/dictproxyobject.py
--- a/pypy/objspace/std/dictproxyobject.py
+++ b/pypy/objspace/std/dictproxyobject.py
@@ -17,16 +17,16 @@
     def __init__(w_self, space):
         DictStrategy.__init__(w_self, space)
 
-    def getitem(self, w_dict, w_lookup):
+    def getitem(self, w_dict, w_key):
         space = self.space
-        w_lookup_type = space.type(w_lookup)
+        w_lookup_type = space.type(w_key)
         if space.is_w(w_lookup_type, space.w_str):
-            return self.getitem_str(w_dict, space.str_w(w_lookup))
+            return self.getitem_str(w_dict, space.str_w(w_key))
         else:
             return None
 
-    def getitem_str(self, w_dict, lookup):
-        return self.unerase(w_dict.dstorage).getdictvalue(self.space, lookup)
+    def getitem_str(self, w_dict, key):
+        return self.unerase(w_dict.dstorage).getdictvalue(self.space, key)
 
     def setitem(self, w_dict, w_key, w_value):
         space = self.space
@@ -35,10 +35,10 @@
         else:
             raise OperationError(space.w_TypeError, space.wrap("cannot add non-string keys to dict of a type"))
 
-    def setitem_str(self, w_dict, name, w_value):
+    def setitem_str(self, w_dict, key, w_value):
         w_type = self.unerase(w_dict.dstorage)
         try:
-            w_type.setdictvalue(self.space, name, w_value)
+            w_type.setdictvalue(self.space, key, w_value)
         except OperationError, e:
             if not e.match(self.space, self.space.w_TypeError):
                 raise
@@ -47,7 +47,7 @@
             # xxx obscure workaround: allow cpyext to write to type->tp_dict.
             # xxx like CPython, we assume that this is only done early after
             # xxx the type is created, and we don't invalidate any cache.
-            w_type.dict_w[name] = w_value
+            w_type.dict_w[key] = w_value
 
     def setdefault(self, w_dict, w_key, w_default):
         space = self.space
diff --git a/pypy/objspace/std/mapdict.py b/pypy/objspace/std/mapdict.py
--- a/pypy/objspace/std/mapdict.py
+++ b/pypy/objspace/std/mapdict.py
@@ -595,16 +595,16 @@
         w_dict.dstorage = strategy.erase(dict_w)
         materialize_r_dict(self.space, w_obj, dict_w)
 
-    def getitem(self, w_dict, w_lookup):
+    def getitem(self, w_dict, w_key):
         space = self.space
-        w_lookup_type = space.type(w_lookup)
+        w_lookup_type = space.type(w_key)
         if space.is_w(w_lookup_type, space.w_str):
-            return self.getitem_str(w_dict, space.str_w(w_lookup))
+            return self.getitem_str(w_dict, space.str_w(w_key))
         elif _never_equal_to_string(space, w_lookup_type):
             return None
         else:
             self.switch_to_object_strategy(w_dict)
-            return w_dict.getitem(w_lookup)
+            return w_dict.getitem(w_key)
 
     def getitem_str(self, w_dict, key):
         w_obj = self.unerase(w_dict.dstorage)