[GR-23213] Get most of test_defaultdict pass

PullRequest: graalpython/1118

Author: timfel

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

@@ -1,3 +1,10 @@
+*graalpython.lib-python.3.test.test_defaultdict.TestDefaultDict.test_basic
+*graalpython.lib-python.3.test.test_defaultdict.TestDefaultDict.test_callable_arg
+*graalpython.lib-python.3.test.test_defaultdict.TestDefaultDict.test_copy
 *graalpython.lib-python.3.test.test_defaultdict.TestDefaultDict.test_deep_copy
+*graalpython.lib-python.3.test.test_defaultdict.TestDefaultDict.test_keyerror_without_factory
+*graalpython.lib-python.3.test.test_defaultdict.TestDefaultDict.test_missing
 *graalpython.lib-python.3.test.test_defaultdict.TestDefaultDict.test_pickling
+*graalpython.lib-python.3.test.test_defaultdict.TestDefaultDict.test_print
+*graalpython.lib-python.3.test.test_defaultdict.TestDefaultDict.test_repr
 *graalpython.lib-python.3.test.test_defaultdict.TestDefaultDict.test_shallow_copy

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/MethodBuiltins.java

@@ -133,9 +133,9 @@ public abstract static class ReprNode extends PythonUnaryBuiltinNode {
         Object reprMethod(VirtualFrame frame, PMethod self,
                         @CachedLibrary("self.getSelf()") PythonObjectLibrary lib,
                         @Cached("createGetAttributeNode()") GetAttributeNode getNameAttrNode,
-                        @Cached("create()") GetNameNode getTypeNameNode) {
+                        @Cached GetNameNode getTypeNameNode) {
             String typeName = getTypeNameNode.execute(lib.getLazyPythonClass(self.getSelf()));
-            return strFormat("<built-in method %s of %s object at 0x%x>", getNameAttrNode.executeObject(frame, self.getFunction()), typeName, hashCode(self));
+            return strFormat("<bound method %s of %s object at 0x%x>", getNameAttrNode.executeObject(frame, self.getFunction()), typeName, hashCode(self));
         }
 
         @TruffleBoundary(allowInlining = true)
@@ -149,7 +149,7 @@ private static String strFormat(String fmt, Object... objects) {
         }
 
         protected static GetAttributeNode createGetAttributeNode() {
-            return GetAttributeNode.create(SpecialAttributeNames.__NAME__, null);
+            return GetAttributeNode.create(SpecialAttributeNames.__QUALNAME__, null);
         }
     }
 

graalpython/lib-graalpython/_collections.py

@@ -645,15 +645,24 @@ def __next__(self):
 
 
 class defaultdict(dict):
-    def __init__(self, default_factory, *args, **kwds):
+    def __init__(self, default_factory=None, *args, **kwds):
         dict.__init__(self, *args, **kwds)
-        self.default_factory = default_factory
+        if (default_factory is None or callable(default_factory)):
+            self.default_factory = default_factory
+        else:
+            raise TypeError("first argument must be callable or None")
 
     def __missing__(self, key):
         if self.default_factory is None:
-            raise KeyError((key,))
+            raise KeyError(key)
         self[key] = value = self.default_factory()
         return value
-    
+
     def __repr__(self):
-        return "%s(%r, %s)" % (type(self).__name__, self.default_factory, dict.__repr__(self))  
+        return "%s(%r, %s)" % (type(self).__name__, self.default_factory, dict.__repr__(self))
+
+    def copy(self):
+        cp = defaultdict(default_factory=self.default_factory)
+        for k,v in self.items():
+            cp[k] = v
+        return cp