Make tests for SimpleNamespace pass

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_types.txt

@@ -27,8 +27,19 @@
 *graalpython.lib-python.3.test.test_types.MappingProxyTests.test_iterators
 *graalpython.lib-python.3.test.test_types.MappingProxyTests.test_len
 *graalpython.lib-python.3.test.test_types.SimpleNamespaceTests.test_as_dict
+*graalpython.lib-python.3.test.test_types.SimpleNamespaceTests.test_attrdel
+*graalpython.lib-python.3.test.test_types.SimpleNamespaceTests.test_attrget
+*graalpython.lib-python.3.test.test_types.SimpleNamespaceTests.test_attrset
+*graalpython.lib-python.3.test.test_types.SimpleNamespaceTests.test_constructor
+*graalpython.lib-python.3.test.test_types.SimpleNamespaceTests.test_equal
 *graalpython.lib-python.3.test.test_types.SimpleNamespaceTests.test_fake_namespace_compare
+*graalpython.lib-python.3.test.test_types.SimpleNamespaceTests.test_nested
+*graalpython.lib-python.3.test.test_types.SimpleNamespaceTests.test_pickle
 *graalpython.lib-python.3.test.test_types.SimpleNamespaceTests.test_recursive
+*graalpython.lib-python.3.test.test_types.SimpleNamespaceTests.test_repr
+*graalpython.lib-python.3.test.test_types.SimpleNamespaceTests.test_subclass
+*graalpython.lib-python.3.test.test_types.SimpleNamespaceTests.test_unbound
+*graalpython.lib-python.3.test.test_types.SimpleNamespaceTests.test_underlying_dict
 *graalpython.lib-python.3.test.test_types.TypesTests.test_boolean_ops
 *graalpython.lib-python.3.test.test_types.TypesTests.test_comparisons
 *graalpython.lib-python.3.test.test_types.TypesTests.test_float__format__

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java

@@ -65,14 +65,17 @@
 import com.oracle.graal.python.builtins.objects.method.PMethod;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
+import com.oracle.graal.python.builtins.objects.type.TypeNodes;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.argument.ReadIndexedArgumentNode;
 import com.oracle.graal.python.nodes.argument.ReadVarArgsNode;
 import com.oracle.graal.python.nodes.function.FunctionRootNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
+import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
+import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.subscript.GetItemNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.nodes.util.CannotCastException;
@@ -456,4 +459,29 @@ protected Object getToolPath(String tool) {
             return toolPath.toString();
         }
     }
+
+    // Equivalent of PyType_IsSubtype
+    @Builtin(name = "is_subtype", minNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    public abstract static class IsSubtypeNode extends PythonBinaryBuiltinNode {
+        @Specialization
+        public boolean isSubtype(VirtualFrame frame, Object derived, Object cls,
+                        @Cached com.oracle.graal.python.nodes.classes.IsSubtypeNode isSubtypeNode) {
+            return isSubtypeNode.execute(frame, derived, cls);
+        }
+    }
+
+    // Equivalent of PyObject_TypeCheck
+    @Builtin(name = "type_check", minNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    public abstract static class TypeCheckNode extends PythonBinaryBuiltinNode {
+        @Specialization(limit = "3")
+        boolean typeCheck(VirtualFrame frame, Object instance, Object cls,
+                        @Cached GetClassNode getClassNode,
+                        @Cached TypeNodes.IsSameTypeNode isSameTypeNode,
+                        @Cached com.oracle.graal.python.nodes.classes.IsSubtypeNode isSubtypeNode) {
+            Object instanceClass = getClassNode.execute(instance);
+            return isSameTypeNode.execute(instanceClass, cls) || isSubtypeNode.execute(frame, instanceClass, cls);
+        }
+    }
 }

graalpython/lib-graalpython/_descriptor.py

@@ -77,20 +77,20 @@ def func(self):
 
 class SimpleNamespace(object):
     def __init__(self, **kwargs):
-        object.__setattr__(self, "__ns__", kwargs)
-
-    def __delattr__(self, name):
-        object.__getattribute__(self, "__ns__").__delitem__(name)
-
-    def __getattr__(self, name):
-        return object.__getattribute__(self, "__ns__")[name]
-
-    def __setattr__(self, name, value):
-        object.__getattribute__(self, "__ns__")[name] = value
+        for k, v in kwargs.items():
+            setattr(self, k, v)
 
     def __repr__(self):
         sb = []
-        ns = object.__getattribute__(self, "__ns__")
-        for k,v in ns.items():
-            sb.append("%s='%s'" % (k,v))
-        return "namespace(%s)" % ", ".join(sb)
+        for k, v in sorted(self.__dict__.items()):
+            sb.append("%s=%r" % (k, v))
+        name = 'namespace' if type(self) is SimpleNamespace else type(self).__name__
+        return "%s(%s)" % (name, ", ".join(sb))
+
+    def __reduce__(self):
+        return type(self), (), self.__dict__
+
+    def __eq__(self, other):
+        if __graalpython__.type_check(self, SimpleNamespace) and __graalpython__.type_check(other, SimpleNamespace):
+            return self.__dict__ == other.__dict__
+        return NotImplemented