fix interop tests

Author: timfel

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/JavaInteropTest.java

@@ -50,7 +50,6 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
-import java.util.List;
 
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Context.Builder;
@@ -300,22 +299,17 @@ public void accessSuitePy() throws IOException {
                             "}",
                             "suite.py").build();
             Value suite = context.eval(suitePy);
-
-            Value listConverter = context.eval("python", "list");
-            Value libraries = suite.getMember("libraries");
+            Value libraries = suite.getHashValue("libraries");
             assertNotNull("libraries found", libraries);
-            final List<Object> suiteKeys = Arrays.asList(listConverter.execute(suite.invokeMember("keys")).as(Object[].class));
-            assertTrue("Libraries found among keys: " + suiteKeys, suiteKeys.contains("libraries"));
-
             Value dacapo = null;
-            for (Object k : listConverter.execute(libraries.invokeMember("keys")).as(List.class)) {
+            for (Object k : libraries.getHashKeysIterator().as(Iterable.class)) {
                 System.err.println("k " + k);
                 if ("DACAPO".equals(k)) {
-                    dacapo = libraries.getMember((String) k);
+                    dacapo = libraries.getHashValue(k);
                 }
             }
             assertNotNull("Dacapo found", dacapo);
-            assertEquals("'e39957904b7e79caf4fa54f30e8e4ee74d4e9e37'", dacapo.getMember("sha1").toString());
+            assertEquals("'e39957904b7e79caf4fa54f30e8e4ee74d4e9e37'", dacapo.getHashValue("sha1").toString());
         }
 
         @ExportLibrary(InteropLibrary.class)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java

@@ -1461,9 +1461,10 @@ static boolean access(Object object, String attrKeyName, int type,
                                 // can only modify if the object is not immutable
                                 return !isImmutable.execute(owner);
                             } else if (getSetNode.execute(attr, __SET__) == PNone.NO_VALUE) {
-                                // an inherited attribute may be overridable unless it's a setter,
-                                // than we don't know
+                                // an inherited attribute may be overridable unless it's a setter
                                 return !isImmutable.execute(object);
+                            } else if (getSetNode.execute(attr, __SET__) != PNone.NO_VALUE) {
+                                return true;
                             }
                         }
                         return false;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/ForeignObjectBuiltins.java

@@ -771,7 +771,7 @@ protected Object doIt(Object object,
     @GenerateNodeFactory
     abstract static class IndexNode extends PythonUnaryBuiltinNode {
         @Specialization(limit = "3")
-        protected static Object doIt(Object object,
+        protected static long doIt(Object object,
                         @Cached PRaiseNode raiseNode,
                         @CachedLibrary("object") InteropLibrary lib) {
             if (lib.isBoolean(object)) {