fix subtype checking for io.UnsupportedOperation by moving it to the builtin module

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

@@ -257,7 +257,7 @@ public enum PythonBuiltinClassType implements TruffleObject {
     UnicodeTranslateError("UnicodeTranslateError", BUILTINS, Flags.EXCEPTION),
     RecursionError("RecursionError", BUILTINS, Flags.EXCEPTION),
 
-    IOUnsupportedOperation("UnsupportedOperation", "_io", Flags.EXCEPTION),
+    IOUnsupportedOperation("UnsupportedOperation", "io", Flags.EXCEPTION),
 
     // warnings
     Warning("Warning", BUILTINS, Flags.EXCEPTION),

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/IOModuleBuiltins.java

@@ -41,6 +41,9 @@
 package com.oracle.graal.python.builtins.modules.io;
 
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.IOUnsupportedOperation;
+import static com.oracle.graal.python.builtins.PythonBuiltinClassType.BlockingIOError;
+import static com.oracle.graal.python.builtins.PythonBuiltinClassType.OSError;
+import static com.oracle.graal.python.builtins.PythonBuiltinClassType.ValueError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.PBufferedRandom;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.PBufferedReader;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.PBufferedWriter;
@@ -52,9 +55,8 @@
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltins;
-import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
-import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
+import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.runtime.PythonCore;
@@ -75,17 +77,10 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     public void initialize(PythonCore core) {
         super.initialize(core);
         builtinConstants.put("DEFAULT_BUFFER_SIZE", DEFAULT_BUFFER_SIZE);
-    }
-
-    @Override
-    public void postInitialize(PythonCore core) {
-        super.postInitialize(core);
-        /*
-         * This is temporary fix and will be removed once _io patches are removed.
-         */
-        PythonModule ioModule = core.lookupBuiltinModule("_io");
-        PythonAbstractClass unspportedOp = (PythonAbstractClass) ioModule.getAttribute("UnsupportedOperation");
-        core.lookupType(IOUnsupportedOperation).setSuperClass(unspportedOp);
+        PythonBuiltinClass unsupportedOpExcType = core.lookupType(IOUnsupportedOperation);
+        unsupportedOpExcType.setSuperClass(core.lookupType(OSError), core.lookupType(ValueError));
+        builtinConstants.put("UnsupportedOperation", unsupportedOpExcType);
+        builtinConstants.put("BlockingIOError", core.lookupType(BlockingIOError));
     }
 
     @Builtin(name = "_IOBase", minNumOfPositionalArgs = 1, takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PIOBase)

graalpython/lib-graalpython/_io.py

@@ -29,13 +29,6 @@
 SEEK_CUR = 1
 SEEK_END = 2
 
-class BlockingIOError(OSError):
-    pass
-
-
-class UnsupportedOperation(OSError, ValueError):
-    pass
-
 
 class StdPrinter:
     def __init__(self, file_io):

graalpython/lib-python/3/io.py

@@ -59,7 +59,8 @@
 OpenWrapper = _io.open # for compatibility with _pyio
 
 # Pretend this exception was created here.
-UnsupportedOperation.__module__ = "io"
+# Truffle change: we do this directly on the builtin type
+# UnsupportedOperation.__module__ = "io"
 
 # for seek()
 SEEK_SET = 0