share error message in WrapTpNew and fix None, Ellipsis, and NotImplemented constructors

Author: timfel

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

@@ -2673,44 +2673,29 @@ Object doNative(PythonAbstractNativeObject self, Object[] varargs, PKeyword[] kw
     @Builtin(name = "NotImplementedType", minNumOfPositionalArgs = 1, constructsClass = PythonBuiltinClassType.PNotImplemented, isPublic = false)
     @GenerateNodeFactory
     public abstract static class NotImplementedTypeNode extends PythonBuiltinNode {
-        protected PythonBuiltinClass getNotImplementedClass() {
-            return getCore().lookupType(PythonBuiltinClassType.PNotImplemented);
-        }
-
         @Specialization
         public PNotImplemented module(Object cls) {
-            if (cls != getNotImplementedClass()) {
-                throw raise(TypeError, ErrorMessages.OBJ_ISNT_CALLABLE, "NotImplementedType");
-            } else {
-                return PNotImplemented.NOT_IMPLEMENTED;
-            }
+            return PNotImplemented.NOT_IMPLEMENTED;
         }
     }
 
-    @Builtin(name = "ellipsis", takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PythonBuiltinClassType.PEllipsis, isPublic = false)
+    @Builtin(name = "ellipsis", minNumOfPositionalArgs = 1, constructsClass = PythonBuiltinClassType.PEllipsis, isPublic = false)
     @GenerateNodeFactory
     public abstract static class EllipsisTypeNode extends PythonBuiltinNode {
         @SuppressWarnings("unused")
         @Specialization
-        public PEllipsis call(Object cls, Object args, Object kwds) {
+        public PEllipsis call(Object cls) {
             return PEllipsis.INSTANCE;
         }
     }
 
     @Builtin(name = "NoneType", minNumOfPositionalArgs = 1, constructsClass = PythonBuiltinClassType.PNone, isPublic = false)
     @GenerateNodeFactory
     public abstract static class NoneTypeNode extends PythonBuiltinNode {
-        protected PythonBuiltinClass getNoneClass() {
-            return getCore().lookupType(PythonBuiltinClassType.PNone);
-        }
-
+        @SuppressWarnings("unused")
         @Specialization
         public PNone module(Object cls) {
-            if (cls != getNoneClass()) {
-                throw raise(TypeError, ErrorMessages.IS_NOT_SUBTYPE_OF, "NoneType.__new__", cls, "NoneType");
-            } else {
-                return PNone.NONE;
-            }
+            return PNone.NONE;
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -294,7 +294,7 @@ public abstract class ErrorMessages {
     public static final String IS_NOT_IN_RANGE = "%s is not in range";
     public static final String D_IS_NOT_IN_RANGE = "%d is not in range";
     public static final String IS_NOT_ITERABLE = "%s is not iterable";
-    public static final String IS_NOT_SUBTYPE_OF = "%s(%s) is not a subtype of %s";
+    public static final String IS_NOT_SUBTYPE_OF = "%s.__new__(%N): %N is not a subtype of %s";
     public static final String IS_NOT_TYPE_OBJ = "%s is not a type object (%p)";
     public static final String ISINSTANCE_ARG_2_MUST_BE_TYPE_OR_TUPLE_OF_CLSS_WAS = "issubclass() arg 2 must be a class or tuple of classes";
     public static final String ISINSTANCE_ARG_2_MUST_BE_TYPE_OR_TUPLE_OF_TYPE = "isinstance() arg 2 must be a type or tuple of types (was: %s)";

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/WrapTpNew.java

@@ -45,6 +45,7 @@
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.IsTypeNode;
+import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
@@ -114,7 +115,7 @@ public Object execute(VirtualFrame frame) {
                     state |= NOT_SUBTP_STATE;
                 }
                 throw getRaiseNode().raise(PythonBuiltinClassType.TypeError,
-                                "%s.__new__(%N): %N is not a subtype of %s",
+                                ErrorMessages.IS_NOT_SUBTYPE_OF,
                                 getOwner().getName(), arg0, arg0, getOwner().getName());
             }
             // CPython walks the bases and checks that the first non-heaptype base has the new that