fix in PyMappingCheckNode

tomasstupka · tomasstupka · commit ebe5ae5d7988 · 2022-01-22T00:40:08.000+01:00
- all PSequence types are also a mapping
- PDeque which has __getitem__ isn't
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/test_mappingproxy.py b/graalpython/com.oracle.graal.python.test/src/tests/test_mappingproxy.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -38,6 +38,8 @@
 # SOFTWARE.
 
 # the dict representation of a type is a mappingproxy
+import array, collections
+
 _mappingproxy = type(type.__dict__)
 
 
@@ -128,6 +130,25 @@ def test_iter():
 
     mp_keys = set([k for k in mp])
     assert d.keys() == mp_keys
+    
+def test_create():    
+    _mappingproxy(dict())
+    mp = _mappingproxy({'a': 1})
+    _mappingproxy(mp)
+    _mappingproxy('abc')
+    _mappingproxy(b'abc')
+    _mappingproxy(bytearray(b'abc'))
+    assert_raises(TypeError, _mappingproxy, ())
+    assert_raises(TypeError,_mappingproxy, (1,2,3))
+    assert_raises(TypeError,_mappingproxy, [])
+    assert_raises(TypeError,_mappingproxy, [1,2,3])
+    _mappingproxy(memoryview(b'abc'))
+    _mappingproxy(array.array("I", [1,2,3]))
+    assert_raises(TypeError, _mappingproxy, collections.deque([1,2,3]))
+    assert_raises(TypeError, _mappingproxy, set())
+    assert_raises(TypeError, _mappingproxy, {1,2,3})
+    assert_raises(TypeError, _mappingproxy, None)
+    assert_raises(TypeError, _mappingproxy, 123)
 
 def test_iter_changed_size():
     class A:
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java
@@ -3190,7 +3190,8 @@ public abstract static class MappingproxyNode extends PythonBinaryBuiltinNode {
         @Specialization(guards = "!isNoValue(obj)")
         Object doMapping(Object klass, Object obj,
                         @Cached PyMappingCheckNode mappingCheckNode) {
-            if (mappingCheckNode.execute(obj)) {
+            // descrobject.c mappingproxy_check_mapping()
+            if (!(obj instanceof PList || obj instanceof PTuple) && mappingCheckNode.execute(obj)) {
                 return factory().createMappingproxy(klass, obj);
             }
             throw raise(TypeError, ErrorMessages.ARG_MUST_BE_S_NOT_P, "mappingproxy()", "mapping", obj);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyMappingCheckNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyMappingCheckNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -43,10 +43,13 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.array.PArray;
+import com.oracle.graal.python.builtins.objects.deque.PDeque;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
+import com.oracle.graal.python.builtins.objects.mappingproxy.PMappingproxy;
 import com.oracle.graal.python.builtins.objects.memoryview.PMemoryView;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.range.PRange;
+import com.oracle.graal.python.builtins.objects.set.PBaseSet;
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.attributes.LookupCallableSlotInMRONode;
@@ -75,42 +78,62 @@ static boolean doDict(@SuppressWarnings("unused") PDict object) {
 
     @Specialization
     static boolean doString(@SuppressWarnings("unused") String object) {
-        return false;
+        return true;
     }
 
     @Specialization
     static boolean doSequence(@SuppressWarnings("unused") PSequence object) {
-        return false;
+        return true;
     }
 
     @Specialization
     static boolean doArray(@SuppressWarnings("unused") PArray object) {
-        return false;
+        return true;
     }
 
     @Specialization
     static boolean doMemoryView(@SuppressWarnings("unused") PMemoryView object) {
-        return false;
+        return true;
+    }
+
+    @Specialization
+    static boolean doMappingproxy(@SuppressWarnings("unused") PMappingproxy object) {
+        return true;
     }
 
     @Specialization
     static boolean doRange(@SuppressWarnings("unused") PRange object) {
+        return true;
+    }
+
+    @Specialization
+    static boolean doDeque(@SuppressWarnings("unused") PDeque object) {
+        return false;
+    }
+
+    @Specialization
+    static boolean doSet(@SuppressWarnings("unused") PBaseSet object) {
         return false;
     }
 
     protected static boolean cannotBeMapping(Object object) {
-        return object instanceof String || object instanceof PSequence || object instanceof PArray || object instanceof PMemoryView || object instanceof PRange;
+        return object instanceof PDeque || object instanceof PBaseSet;
+    }
+
+    protected static boolean isKnownMapping(Object object) {
+        return object instanceof PDict || object instanceof String || object instanceof PSequence || object instanceof PArray ||
+                        object instanceof PMemoryView || object instanceof PRange || object instanceof PMappingproxy;
     }
 
-    @Specialization(guards = "!cannotBeMapping(object)")
+    @Specialization(guards = {"!isKnownMapping(object)", "!cannotBeMapping(object)"})
     boolean doPythonObject(PythonObject object,
                     @Shared("getClass") @Cached GetClassNode getClassNode,
                     @Shared("lookupGetItem") @Cached(parameters = "GetItem") LookupCallableSlotInMRONode lookupGetItem) {
         Object type = getClassNode.execute(object);
         return lookupGetItem.execute(type) != PNone.NO_VALUE;
     }
 
-    @Specialization(guards = "!cannotBeMapping(object)", replaces = "doPythonObject")
+    @Specialization(guards = {"!isKnownMapping(object)", "!cannotBeMapping(object)"}, replaces = "doPythonObject")
     boolean doGeneric(Object object,
                     @Shared("getClass") @Cached GetClassNode getClassNode,
                     @Shared("lookupGetItem") @Cached(parameters = "GetItem") LookupCallableSlotInMRONode lookupGetItem,
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/BytesFormatProcessor.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/BytesFormatProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -57,7 +57,10 @@
 import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.ToByteArrayNodeGen;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
+import com.oracle.graal.python.builtins.objects.str.PString;
+import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.tuple.TupleBuiltins;
+import com.oracle.graal.python.lib.PyMappingCheckNode;
 import com.oracle.graal.python.lib.PyObjectAsciiNode;
 import com.oracle.graal.python.lib.PyObjectGetItem;
 import com.oracle.graal.python.nodes.ErrorMessages;
@@ -113,6 +116,12 @@ Object parseMappingKey(int start, int end) {
         return core.factory().createBytes(Arrays.copyOfRange(formatBytes, start, end));
     }
 
+    @Override
+    protected boolean isMapping(Object obj) {
+        // bytesobject.c _PyBytes_FormatEx()
+        return !(obj instanceof PTuple || obj instanceof PBytesLike || obj instanceof PString || obj instanceof String) && PyMappingCheckNode.getUncached().execute(obj);
+    }
+
     @Override
     protected double asFloat(Object arg) {
         try {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/FormatProcessor.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/FormatProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
  * Copyright (c) -2016 Jython Developers
  *
  * Licensed under PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -24,7 +24,6 @@
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.tuple.TupleBuiltins;
 import com.oracle.graal.python.lib.PyFloatAsDoubleNode;
-import com.oracle.graal.python.lib.PyMappingCheckNode;
 import com.oracle.graal.python.lib.PyObjectGetItem;
 import com.oracle.graal.python.lib.PyObjectSizeNode;
 import com.oracle.graal.python.nodes.ErrorMessages;
@@ -90,6 +89,8 @@ <F extends InternalFormat.Formatter> F setupFormat(F f) {
 
     abstract Object parseMappingKey(int start, int end);
 
+    protected abstract boolean isMapping(Object obj);
+
     static Object lookupAttribute(Object owner, String name) {
         return LookupAttributeInMRONode.Dynamic.getUncached().execute(GetClassNode.getUncached().execute(owner), name);
     }
@@ -230,10 +231,6 @@ protected static boolean isString(Object args1, Object lazyClass) {
         return PGuards.isString(args1) || isSubtype(lazyClass, PythonBuiltinClassType.PString);
     }
 
-    protected static boolean isMapping(Object args1) {
-        return PyMappingCheckNode.getUncached().execute(args1);
-    }
-
     protected static boolean isSubtype(Object lazyClass, PythonBuiltinClassType clazz) {
         return IsSubtypeNodeGen.getUncached().execute(lazyClass, clazz);
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/StringFormatProcessor.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/StringFormatProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
  * Copyright (c) -2016 Jython Developers
  *
  * Licensed under PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -11,7 +11,9 @@
 
 import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.builtins.objects.str.PString;
+import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.tuple.TupleBuiltins;
+import com.oracle.graal.python.lib.PyMappingCheckNode;
 import com.oracle.graal.python.lib.PyObjectAsciiNode;
 import com.oracle.graal.python.lib.PyObjectGetItem;
 import com.oracle.graal.python.lib.PyObjectReprAsJavaStringNode;
@@ -58,6 +60,12 @@ Object parseMappingKey(int start, int end) {
         return formatText.substring(start, end);
     }
 
+    @Override
+    protected boolean isMapping(Object obj) {
+        // unicodeobject.c PyUnicode_Format()
+        return !(obj instanceof PTuple || obj instanceof PString || obj instanceof String) && PyMappingCheckNode.getUncached().execute(obj);
+    }
+
     private static boolean isOneCharacter(String str) {
         return str.length() == 1 || (str.length() == 2 && str.codePointCount(0, 2) == 1);
     }
