ForeignDictIterable -> ForeignDict since all dicts are iterable

Author: eregon

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

@@ -146,7 +146,7 @@ def t(obj):
         self.assertEqual(t(True), polyglot.ForeignBoolean)
         self.assertEqual(t(BaseException()), polyglot.ForeignException)
         self.assertEqual(t(lambda: None), polyglot.ForeignExecutable)
-        self.assertEqual(t({}), polyglot.ForeignDictIterable) # TODO
+        self.assertEqual(t({}), polyglot.ForeignDict)
         # ForeignInstantiable
         self.assertEqual(t((e for e in [1])), polyglot.ForeignIteratorIterable)
         self.assertEqual(t(iter([1])), polyglot.ForeignIteratorIterable)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/GetForeignObjectClassNode.java

@@ -181,17 +181,21 @@ private PythonManagedClass resolvePolyglotForeignClassAndSetInCache(int traits)
 
     // Special naming rules:
     // Foreign...Instantiable...AbstractClass -> Foreign......Class
-    // Foreign...List...Iterable -> Foreign...List... (since all Python lists are iterables)
+    // Foreign...List...Iterable -> Foreign...List... (since all Python lists are iterable)
+    // Foreign...Dict...Iterable -> Foreign...Dict... (since all Python dicts are iterable)
     @TruffleBoundary
     private PythonManagedClass resolvePolyglotForeignClass(int traits) {
         PythonBuiltinClass base = getContext().lookupType(PythonBuiltinClassType.ForeignObject);
         if (traits == 0) {
             return base;
         }
 
-        // For foreign array+iterable, ignore the iterable trait completely, foreign arrays inherit
-        // from the Python list class and all lists are iterables (they have __iter__)
-        if (Trait.ARRAY.isSet(traits) && Trait.ITERABLE.isSet(traits)) {
+        /*
+         * For foreign array/hash+iterable, ignore the iterable trait completely, foreign
+         * arrays/hashes inherit from the Python list/dict class and all lists/dicts are iterables
+         * (they have __iter__)
+         */
+        if ((Trait.ARRAY.isSet(traits) || Trait.HASH.isSet(traits)) && Trait.ITERABLE.isSet(traits)) {
             return classForTraits(traits - Trait.ITERABLE.bit);
         }