raise warning in test_complex

Author: timfel

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

@@ -355,7 +355,9 @@ public abstract static class ComplexNode extends PythonBuiltinNode {
 
         @Child private IsBuiltinClassProfile isPrimitiveProfile = IsBuiltinClassProfile.create();
         @Child private IsBuiltinClassProfile isComplexTypeProfile;
+        @Child private IsBuiltinClassProfile isResultComplexTypeProfile;
         @Child private LookupAndCallUnaryNode callReprNode;
+        @Child private WarnNode warnNode;
 
         private PComplex createComplex(Object cls, double real, double imaginary) {
             if (isPrimitiveProfile.profileClass(cls, PythonBuiltinClassType.PComplex)) {
@@ -563,6 +565,22 @@ private IsBuiltinClassProfile getIsComplexTypeProfile() {
             return isComplexTypeProfile;
         }
 
+        private IsBuiltinClassProfile getIsResultComplexTypeProfile() {
+            if (isResultComplexTypeProfile == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                isResultComplexTypeProfile = insert(IsBuiltinClassProfile.create());
+            }
+            return isResultComplexTypeProfile;
+        }
+
+        private WarnNode getWarnNode() {
+            if (warnNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                warnNode = insert(WarnNode.create());
+            }
+            return warnNode;
+        }
+
         private PException raiseFirstArgError(Object x) {
             throw raise(PythonBuiltinClassType.TypeError, ErrorMessages.ARG_MUST_BE_STRING_OR_NUMBER, "complex() first", x);
         }
@@ -579,14 +597,14 @@ private PComplex getComplexNumberFromObject(VirtualFrame frame, Object object, P
                 if (complexCallable != PNone.NO_VALUE) {
                     Object result = methodLib.callUnboundMethod(complexCallable, frame, object);
                     if (result instanceof PComplex) {
-                        // TODO we need pass here deprecation warning
-                        // DeprecationWarning: __complex__ returned non-complex (type %p).
-                        // The ability to return an instance of a strict subclass of complex is
-                        // deprecated,
-                        // and may be removed in a future version of Python.
+                        if (!getIsResultComplexTypeProfile().profileObject(result, PythonBuiltinClassType.PComplex)) {
+                            getWarnNode().warnFormat(frame, null, PythonBuiltinClassType.DeprecationWarning, 1,
+                                            ErrorMessages.P_RETURNED_NON_P,
+                                            object, "__complex__", "complex", result, "complex");
+                        }
                         return (PComplex) result;
                     } else {
-                        throw raise(TypeError, ErrorMessages.COMPLEX_SHOULD_RETURN_COMPLEX);
+                        throw raise(TypeError, ErrorMessages.COMPLEX_RETURNED_NON_COMPLEX, result);
                     }
                 }
                 if (object instanceof PComplex) {

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

@@ -182,7 +182,6 @@ public abstract class ErrorMessages {
     public static final String COMPLEX_ZERO_TO_NEGATIVE_POWER = "0.0 to a negative or complex power";
     public static final String COMPLEX_MODULO = "complex modulo";
     public static final String COMPLEX_RETURNED_NON_COMPLEX = "__complex__ returned non-complex (type %p)";
-    public static final String COMPLEX_SHOULD_RETURN_COMPLEX = "__complex__ should return a complex object";
     public static final String CONTIGUOUS_BUFFER = "contiguous buffer";
     public static final String CONVERTER_FUNC_FAILED_TO_SET_ERROR = "converter function failed to set an error on failure";
     public static final String CORRUPTED_CAPI_LIB_OBJ = "corrupted C API library object: %s";

graalpython/lib-python/3/test/test_complex.py

@@ -405,11 +405,8 @@ def __complex__(self):
 
         self.assertEqual(complex(complex0(1j)), 42j)
 
-        # Assertions that check DeprecationWarnings have been temporarily disabled since
-        # graalvm does not support warnings yet.
-
-#        with self.assertWarns(DeprecationWarning):
-        self.assertEqual(complex(complex1(1j)), 2j)
+        with self.assertWarns(DeprecationWarning):
+            self.assertEqual(complex(complex1(1j)), 2j)
         self.assertRaises(TypeError, complex, complex2(1j))
 
     @support.requires_IEEE_754