[pypy-commit] pypy remove-dict-smm: Remove dict.values SMM.

[Manuel Jacob]

Author: Manuel Jacob
Branch: remove-dict-smm
Changeset: r64076:e54f2a055f4d
Date: 2013-05-14 16:08 +0200
http://bitbucket.org/pypy/pypy/changeset/e54f2a055f4d/

Log:	Remove dict.values SMM.

diff --git a/pypy/objspace/std/dictmultiobject.py b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -123,8 +123,9 @@
         """D.keys() -> list of D's keys"""
         return self.w_keys()
 
-#    def descr_values(self, space):
-#        """"""
+    def descr_values(self, space):
+        """D.values() -> list of D's values"""
+        return space.newlist(self.values())
 
 #    def descr_has_key(self, space):
 #        """"""
@@ -956,9 +957,6 @@
         w_res = space.lt(w_leftval, w_rightval)
     return w_res
 
-def dict_values__DictMulti(space, w_self):
-    return space.newlist(w_self.values())
-
 def dict_iteritems__DictMulti(space, w_self):
     return W_DictMultiIterItemsObject(space, w_self.iteritems())
 
@@ -1167,7 +1165,7 @@
 dict_keys       = SMM('keys',          1,
                       doc="")
 dict_values     = SMM('values',        1,
-                      doc="D.values() -> list of D's values")
+                      doc="")
 dict_has_key    = SMM('has_key',       2,
                       doc='D.has_key(k) -> True if D has a key k, else False')
 dict_clear      = SMM('clear',         1,
@@ -1292,7 +1290,7 @@
     copy = gateway.interp2app(W_DictMultiObject.descr_copy),
     items = gateway.interp2app(W_DictMultiObject.descr_items),
     keys = gateway.interp2app(W_DictMultiObject.descr_keys),
-    #values = gateway.interp2app(W_DictMultiObject.descr_values),
+    values = gateway.interp2app(W_DictMultiObject.descr_values),
     #has_key = gateway.interp2app(W_DictMultiObject.descr_has_key),
     #clear = gateway.interp2app(W_DictMultiObject.descr_clear),
     #get = gateway.interp2app(W_DictMultiObject.descr_get),