[GR-23223] Make test_exception_hierarchy pass

PullRequest: graalpython/956

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_exception_hierarchy.txt

@@ -1,8 +1,16 @@
+*AttributesTest.test_blockingioerror
 *AttributesTest.test_errno_translation
 *AttributesTest.test_posix_error
 *AttributesTest.test_windows_error
 *ExplicitSubclassingTest.test_errno_mapping
 *ExplicitSubclassingTest.test_init_kwdargs
+*ExplicitSubclassingTest.test_init_new_overridden
+*ExplicitSubclassingTest.test_init_overridden
+*ExplicitSubclassingTest.test_init_standalone
+*ExplicitSubclassingTest.test_new_kwdargs
+*ExplicitSubclassingTest.test_new_overridden
 *HierarchyTest.test_builtin_errors
 *HierarchyTest.test_errno_mapping
+*HierarchyTest.test_select_error
+*HierarchyTest.test_socket_errors
 *HierarchyTest.test_try_except

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

@@ -168,6 +168,9 @@ public enum PythonBuiltinClassType implements LazyPythonClass {
     ZLibError("error", "zlib"),
     LZMAError("LZMAError", "_lzma"),
     StructError("StructError", "_struct"),
+    SocketGAIError("gaierror", "_socket"),
+    SocketHError("herror", "_socket"),
+    SocketTimeout("timeout", "_socket"),
 
     // todo: all OS errors
 
@@ -318,6 +321,9 @@ public final DynamicObject newInstance() {
         ZipImportError.base = ImportError;
         ZLibError.base = Exception;
         LZMAError.base = Exception;
+        SocketGAIError.base = OSError;
+        SocketHError.base = OSError;
+        SocketTimeout.base = OSError;
 
         ReferenceError.base = Exception;
         RuntimeError.base = Exception;

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

@@ -66,6 +66,7 @@
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.util.CoerceToDoubleNode;
 import com.oracle.graal.python.nodes.util.CoerceToFileDescriptorNode;
+import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.graal.python.runtime.sequence.storage.IntSequenceStorage;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -80,6 +81,11 @@
 
 @CoreFunctions(defineModule = "select")
 public class SelectModuleBuiltins extends PythonBuiltins {
+
+    public SelectModuleBuiltins() {
+        builtinConstants.put("error", PythonErrorType.OSError);
+    }
+
     @Override
     protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
         return SelectModuleBuiltinsFactory.getFactories();

graalpython/lib-graalpython/exceptions.py

@@ -131,26 +131,34 @@ def _oserror_use_init(subtype):
 
 def _oserror_init(self, *arg):
     narg = len(arg)
+    self.args = arg
     self.errno = None
     self.strerror = None
     self.filename = None
     self.filename2 = None
     if (2 <= narg and narg <= 5):
+        self.args = arg[0:2]
         self.errno = arg[0]
         self.strerror = arg[1]
         if(narg >= 5):
             self.filename2 = arg[4]
         if(narg >= 3):
-            self.filename = arg[2]
+            if type(self) == BlockingIOError:
+                try:
+                    self.characters_written = arg[2].__index__()
+                except Exception:
+                    self.filename = arg[2]
+            else:
+                self.filename = arg[2]
 
 def OSError__new__(subtype, *args, **kwds):
     newtype = subtype
     if (not _oserror_use_init(newtype) and len(args) > 1):
         myerrno = args[0]
         if (type(myerrno) is int and subtype is OSError and myerrno in _errnomap):
             newtype = _errnomap[myerrno]
-    
-    self = BaseException.__new__(newtype, *args, **kwds)
+
+    self = BaseException.__new__(newtype)
     self.errno = self.strerror = self.filename = self.filename2 = None
     if (not _oserror_use_init(newtype)):
         _oserror_init(self, *args)