[GR-35949][GR-34610] Fixes for np.ndindex and pytz

PullRequest: graalpython/2087

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_unicode.py

@@ -214,6 +214,19 @@ def compile_module(self, name):
         cmpfunc=unhandled_error_compare
     )
 
+    test_PyUnicode_FromFormat_c = CPyExtFunction(
+        _reference_fromformat,
+        lambda: (
+            ("char %c\n", ord('x')),
+            ("char %c\n", ord('あ')),
+        ),
+        resultspec="O",
+        argspec='si',
+        arguments=["char* fmt", "int c"],
+        callfunction="PyUnicode_FromFormat",
+        cmpfunc=unhandled_error_compare
+    )
+
     test_PyUnicode_FromFormat4 = CPyExtFunction(
         _reference_fromformat,
         lambda: (

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

@@ -37,3 +37,11 @@ def test_inputtypes(self):
     def test_baddecorator(self):
         data = 'The quick Brown fox Jumped over The lazy Dog'.split()
         self.assertRaises(TypeError, sorted, data, None, lambda x,y: 0)
+
+    def test_list_subclass(self):
+        class MyList(list):
+            def __iter__(self):
+                return iter([4, 2, 5])
+
+        # Use eval to get the fast path specialization
+        self.assertEqual(eval("sorted(MyList())", {"MyList": MyList}), [2, 4, 5])

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java

@@ -96,7 +96,6 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.TransformExceptionToNativeNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.VoidPtrToJavaNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.PrimitiveNativeWrapper;
-import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.PythonObjectNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.WriteNativeMemberNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.DefaultCheckFunctionResultNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.MethKeywordsRoot;
@@ -107,6 +106,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.NativeReferenceCache.ResolveNativeReferenceNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.PGetDynamicTypeNode.GetSulongTypeNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.PyTruffleObjectFree.FreeNode;
+import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.PythonObjectNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.common.CArrayWrappers.CArrayWrapper;
 import com.oracle.graal.python.builtins.objects.cext.common.CArrayWrappers.CByteArrayWrapper;
 import com.oracle.graal.python.builtins.objects.cext.common.CArrayWrappers.CStringWrapper;
@@ -3367,6 +3367,8 @@ Object doGeneric(String format, Object vaList) {
                                 throw raiseNode.raise(PythonBuiltinClassType.OverflowError, "character argument not in range(0x110000)");
                             }
                             result.append((char) ordinal);
+                            vaArgIdx++;
+                            valid = true;
                             break;
                         case 'd':
                         case 'i':

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/builtins/ListNodes.java

@@ -114,9 +114,10 @@ static PList none(Object cls, @SuppressWarnings("unused") PNone none,
             return factory.createList(cls);
         }
 
-        @Specialization
+        @Specialization(guards = "cannotBeOverridden(list, getClassNode)", limit = "1")
         // Don't use PSequence, that might copy storages that we don't allow for lists
         static PList fromList(Object cls, PList list,
+                        @SuppressWarnings("unused") @Cached GetClassNode getClassNode,
                         @Shared("factory") @Cached PythonObjectFactory factory,
                         @Cached SequenceNodes.GetSequenceStorageNode getSequenceStorageNode,
                         @Cached SequenceStorageNodes.CopyNode copyNode) {