Fix mappingproxy builtins.

Author: fangerer

graalpython/com.oracle.graal.python.test/src/tests/test_mappingproxy.py

@@ -66,14 +66,12 @@ def fn_del(mp):
 
 
 def test_views():
-    d = dict()
-    d['a'] = 1
-    d['b'] = 2
-    d['c'] = 3
+    d = {"a": 1, "b": 2, "c": 3}
     mp = _mappingproxy(d)
 
     assert len(mp) == 3
-    # assert d.keys() == {'a', 'b', 'c'}
+    assert d.keys() == {'a', 'b', 'c'}
+    assert mp.keys() == d.keys()
     assert len(mp.keys()) == 3, "keys view has invalid length"
     assert set(mp.keys()) == {'a', 'b', 'c'}, "keys view invalid"
     assert len(mp.values()) == 3, "values view has invalid length"
@@ -122,3 +120,12 @@ def mp_init(*args):
         return _mappingproxy(*args)
     assert_raises(TypeError, mp_init)
     assert_raises(TypeError, mp_init, None)
+
+
+def test_iter():
+    d = {"a": 1, "b": 2, "c": 3}
+    mp = _mappingproxy(d)
+
+    mp_keys = set([k for k in mp])
+    assert d.keys() == mp_keys
+

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/mappingproxy/MappingproxyBuiltins.java

@@ -25,11 +25,13 @@
  */
 package com.oracle.graal.python.builtins.objects.mappingproxy;
 
+import static com.oracle.graal.python.nodes.SpecialMethodNames.ITEMS;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.KEYS;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__CONTAINS__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__DELITEM__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETITEM__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__INIT__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__ITER__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__LEN__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__SETITEM__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.KeyError;
@@ -66,12 +68,21 @@ public abstract static class InitNode extends PythonBinaryBuiltinNode {
 
         @Specialization
         @SuppressWarnings("unused")
-        Object doPDict(PMappingproxy self, Object mapping) {
+        Object doPMappingproxy(PMappingproxy self, Object mapping) {
             // nothing to do
             return PNone.NONE;
         }
     }
 
+    @Builtin(name = __ITER__, fixedNumOfArguments = 1)
+    @GenerateNodeFactory
+    public abstract static class IterNode extends PythonUnaryBuiltinNode {
+        @Specialization
+        Object run(PMappingproxy self) {
+            return factory().createDictKeysIterator(self);
+        }
+    }
+
     // keys()
     @Builtin(name = KEYS, fixedNumOfArguments = 1)
     @GenerateNodeFactory
@@ -83,6 +94,28 @@ public PDictView keys(PMappingproxy self) {
         }
     }
 
+    // items()
+    @Builtin(name = ITEMS, fixedNumOfArguments = 1)
+    @GenerateNodeFactory
+    public abstract static class ItemsNode extends PythonUnaryBuiltinNode {
+
+        @Specialization
+        public PDictView items(PMappingproxy self) {
+            return factory().createDictItemsView(self);
+        }
+    }
+
+    // values()
+    @Builtin(name = "values", fixedNumOfArguments = 1)
+    @GenerateNodeFactory
+    public abstract static class ValuesNode extends PythonUnaryBuiltinNode {
+
+        @Specialization
+        public PDictView values(PMappingproxy self) {
+            return factory().createDictValuesView(self);
+        }
+    }
+
     // get(key[, default])
     @Builtin(name = "get", minNumOfArguments = 2, maxNumOfArguments = 3)
     @GenerateNodeFactory

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -473,11 +473,11 @@ public PDictView createDictKeysView(PHashingCollection dict) {
         return trace(new PDictKeysView(lookupClass(PythonBuiltinClassType.PDictKeysView), dict));
     }
 
-    public PDictView createDictValuesView(PDict dict) {
+    public PDictView createDictValuesView(PHashingCollection dict) {
         return trace(new PDictValuesView(lookupClass(PythonBuiltinClassType.PDictValuesView), dict));
     }
 
-    public PDictView createDictItemsView(PDict dict) {
+    public PDictView createDictItemsView(PHashingCollection dict) {
         return trace(new PDictItemsView(lookupClass(PythonBuiltinClassType.PDictItemsView), dict));
     }
 

graalpython/lib-graalpython/_mappingproxy.py

@@ -37,56 +37,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-class mappingproxy_iterator(object):
-    def __init__(self, proxy):
-        self.items = proxy.keys()
-        self.index = 0
-
-    def __iter__(self):
-        return self
-
-    def __length_hint__(self):
-        return len(self.items)
-
-    def __next__(self):
-        if self.index >= len(self.items):
-            raise StopIteration
-        else:
-            index = self.index
-            self.index += 1
-            return self.items[index]
-
-
 mappingproxy = type(type.__dict__)
 
 
-def __iter__(self):
-    return mappingproxy_iterator(self)
-mappingproxy.__iter__ = __iter__
-
-
-def clear(self):
-    for k in self.keys():
-        delete_attribute(self.obj, k)
-mappingproxy.clear = clear
-
-
-def items(self):
-    items = []
-    for k in self.keys():
-        items.append(tuple([k, self.get(k)]))
-    return items
-mappingproxy.items = items
-
-
-def values(self):
-    values = []
-    for k in self.keys():
-        values.append(self.get(k))
-    return values
-mappingproxy.values = values
-
-
 def __repr__(self):
     d = []
     for k in self.keys():
@@ -98,3 +51,4 @@ def __repr__(self):
 
 
 mappingproxy.update = dict.update
+mappingproxy.__hash__ = dict.__hash__