[GR-13350] __new__ method of OSError works as a factory

PullRequest: graalpython/360

Author: ppisl

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/module/PosixTest.java

@@ -75,7 +75,7 @@ public void open() {
 
     @Test
     public void openFail() {
-        assertLastLineErrorContains("OSError",
+        assertLastLineErrorContains("FileNotFoundError",
                         "import posix; print(posix.open('prettysurethisisnthere', 0) > 2)");
     }
 

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

@@ -1,10 +1,11 @@
-# Copyright (c) 2018, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates.
 # Copyright (C) 1996-2017 Python Software Foundation
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 
 import unittest
 import sys
+import errno
 
 class ExceptionTests(unittest.TestCase):
 
@@ -50,3 +51,60 @@ class MyException(Exception):
         self.assertIsInstance(e, MyException)
         # TODO this dosn't work yet
         #self.assertEqual(e.__traceback__, tb)
+
+    def test_aliases(self):
+        self.assertTrue (IOError is OSError)
+        self.assertTrue (EnvironmentError is OSError)
+
+    def test_new_oserror(self):
+        self.assertTrue(type(OSError(2)) is OSError)
+        self.assertTrue(type(OSError(errno.EISDIR)) is OSError)
+        self.assertTrue(type(OSError(2, "a message")) is FileNotFoundError)
+        
+        self.assertTrue(type(OSError(errno.EISDIR, "a message")) is IsADirectoryError)
+        self.assertTrue(type(OSError(errno.EAGAIN, "a message")) is BlockingIOError)
+        self.assertTrue(type(OSError(errno.EALREADY, "a message")) is BlockingIOError)
+        self.assertTrue(type(OSError(errno.EINPROGRESS, "a message")) is BlockingIOError)
+        self.assertTrue(type(OSError(errno.EWOULDBLOCK, "a message")) is BlockingIOError)
+        self.assertTrue(type(OSError(errno.EPIPE, "a message")) is BrokenPipeError)
+        self.assertTrue(type(OSError(errno.ESHUTDOWN, "a message")) is BrokenPipeError)
+        self.assertTrue(type(OSError(errno.ECHILD, "a message")) is ChildProcessError)
+        self.assertTrue(type(OSError(errno.ECONNABORTED, "a message")) is ConnectionAbortedError)
+        self.assertTrue(type(OSError(errno.ECONNREFUSED, "a message")) is ConnectionRefusedError)
+        self.assertTrue(type(OSError(errno.ECONNRESET, "a message")) is ConnectionResetError)
+        self.assertTrue(type(OSError(errno.EEXIST, "a message")) is FileExistsError)
+        self.assertTrue(type(OSError(errno.ENOENT, "a message")) is FileNotFoundError)
+        self.assertTrue(type(OSError(errno.ENOTDIR, "a message")) is NotADirectoryError)
+        self.assertTrue(type(OSError(errno.EINTR, "a message")) is InterruptedError)
+        self.assertTrue(type(OSError(errno.EACCES, "a message")) is PermissionError)
+        self.assertTrue(type(OSError(errno.EPERM, "a message")) is PermissionError)
+        self.assertTrue(type(OSError(errno.ESRCH, "a message")) is ProcessLookupError)
+        self.assertTrue(type(OSError(errno.ETIMEDOUT, "a message")) is TimeoutError)
+
+    def test_oserror_empty_attributes(self):
+        e = OSError(errno.EISDIR)
+        self.assertEqual(e.errno, None)
+        self.assertEqual(e.strerror, None)
+        self.assertEqual(e.filename, None)
+        self.assertEqual(e.filename2, None)
+
+    def test_oserror_two_attributes(self):
+        e = OSError(errno.EISDIR, "message")
+        self.assertEqual(e.errno, 21)
+        self.assertEqual(e.strerror, "message")
+        self.assertEqual(e.filename, None)
+        self.assertEqual(e.filename2, None)
+
+    def test_oserror_four_attribute(self):
+        e = OSError(errno.EISDIR, "message", "file1")
+        self.assertEqual(e.errno, 21)
+        self.assertEqual(e.strerror, "message")
+        self.assertEqual(e.filename, "file1")
+        self.assertEqual(e.filename2, None)
+
+    def test_oserror_four_attribute(self):
+        e = OSError(errno.EISDIR, "message", "file1", None, "file2")
+        self.assertEqual(e.errno, 21)
+        self.assertEqual(e.strerror, "message")
+        self.assertEqual(e.filename, "file1")
+        self.assertEqual(e.filename2, "file2")

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -122,7 +122,6 @@ public enum PythonBuiltinClassType implements LazyPythonClass {
     NameError("NameError", "builtins"),
     UnboundLocalError("UnboundLocalError", "builtins"),
     OSError("OSError", "builtins"),
-    IOError("IOError", "builtins"),
     BlockingIOError("BlockingIOError", "builtins"),
     ChildProcessError("ChildProcessError", "builtins"),
     ConnectionError("ConnectionError", "builtins"),
@@ -253,7 +252,6 @@ public Shape getInstanceShape() {
         NameError.base = Exception;
         UnboundLocalError.base = NameError;
         OSError.base = Exception;
-        IOError.base = Exception;
         BlockingIOError.base = OSError;
         ChildProcessError.base = OSError;
         ConnectionError.base = OSError;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -40,11 +40,13 @@
  */
 package com.oracle.graal.python.builtins.modules;
 
+import com.oracle.graal.python.builtins.objects.exception.OSErrorEnum;
 import java.util.ArrayList;
 import java.util.List;
 
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltins;
+import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.truffle.api.dsl.NodeFactory;
@@ -56,145 +58,22 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
         return new ArrayList<>();
     }
 
-    /**
-     * Generated using the following:
-     *
-     * <pre>
-     * grep -RPo "#define\s+([A-Z]+)\s+(\d+)" /usr/include/asm-generic/errno* | awk '{print "builtinConstants.put(\"" $2 "\", " $3 ");"}'
-     * </pre>
-     */
     @Override
     public void initialize(PythonCore core) {
         super.initialize(core);
-        builtinConstants.put("EPERM", 1);
-        builtinConstants.put("ENOENT", 2);
-        builtinConstants.put("ESRCH", 3);
-        builtinConstants.put("EINTR", 4);
-        builtinConstants.put("EIO", 5);
-        builtinConstants.put("ENXIO", 6);
-        builtinConstants.put("ENOEXEC", 8);
-        builtinConstants.put("EBADF", 9);
-        builtinConstants.put("ECHILD", 10);
-        builtinConstants.put("EAGAIN", 11);
-        builtinConstants.put("ENOMEM", 12);
-        builtinConstants.put("EACCES", 13);
-        builtinConstants.put("EFAULT", 14);
-        builtinConstants.put("ENOTBLK", 15);
-        builtinConstants.put("EBUSY", 16);
-        builtinConstants.put("EEXIST", 17);
-        builtinConstants.put("EXDEV", 18);
-        builtinConstants.put("ENODEV", 19);
-        builtinConstants.put("ENOTDIR", 20);
-        builtinConstants.put("EISDIR", 21);
-        builtinConstants.put("EINVAL", 22);
-        builtinConstants.put("ENFILE", 23);
-        builtinConstants.put("EMFILE", 24);
-        builtinConstants.put("ENOTTY", 25);
-        builtinConstants.put("ETXTBSY", 26);
-        builtinConstants.put("EFBIG", 27);
-        builtinConstants.put("ENOSPC", 28);
-        builtinConstants.put("ESPIPE", 29);
-        builtinConstants.put("EROFS", 30);
-        builtinConstants.put("EMLINK", 31);
-        builtinConstants.put("EPIPE", 32);
-        builtinConstants.put("EDOM", 33);
-        builtinConstants.put("ERANGE", 34);
-        builtinConstants.put("EDEADLK", 35);
-        builtinConstants.put("ENAMETOOLONG", 36);
-        builtinConstants.put("ENOLCK", 37);
-        builtinConstants.put("ENOSYS", 38);
-        builtinConstants.put("ENOTEMPTY", 39);
-        builtinConstants.put("ELOOP", 40);
-        builtinConstants.put("ENOMSG", 42);
-        builtinConstants.put("EIDRM", 43);
-        builtinConstants.put("ECHRNG", 44);
-        builtinConstants.put("ELNRNG", 48);
-        builtinConstants.put("EUNATCH", 49);
-        builtinConstants.put("ENOCSI", 50);
-        builtinConstants.put("EBADE", 52);
-        builtinConstants.put("EBADR", 53);
-        builtinConstants.put("EXFULL", 54);
-        builtinConstants.put("ENOANO", 55);
-        builtinConstants.put("EBADRQC", 56);
-        builtinConstants.put("EBADSLT", 57);
-        builtinConstants.put("EBFONT", 59);
-        builtinConstants.put("ENOSTR", 60);
-        builtinConstants.put("ENODATA", 61);
-        builtinConstants.put("ETIME", 62);
-        builtinConstants.put("ENOSR", 63);
-        builtinConstants.put("ENONET", 64);
-        builtinConstants.put("ENOPKG", 65);
-        builtinConstants.put("EREMOTE", 66);
-        builtinConstants.put("ENOLINK", 67);
-        builtinConstants.put("EADV", 68);
-        builtinConstants.put("ESRMNT", 69);
-        builtinConstants.put("ECOMM", 70);
-        builtinConstants.put("EPROTO", 71);
-        builtinConstants.put("EMULTIHOP", 72);
-        builtinConstants.put("EDOTDOT", 73);
-        builtinConstants.put("EBADMSG", 74);
-        builtinConstants.put("EOVERFLOW", 75);
-        builtinConstants.put("ENOTUNIQ", 76);
-        builtinConstants.put("EBADFD", 77);
-        builtinConstants.put("EREMCHG", 78);
-        builtinConstants.put("ELIBACC", 79);
-        builtinConstants.put("ELIBBAD", 80);
-        builtinConstants.put("ELIBSCN", 81);
-        builtinConstants.put("ELIBMAX", 82);
-        builtinConstants.put("ELIBEXEC", 83);
-        builtinConstants.put("EILSEQ", 84);
-        builtinConstants.put("ERESTART", 85);
-        builtinConstants.put("ESTRPIPE", 86);
-        builtinConstants.put("EUSERS", 87);
-        builtinConstants.put("ENOTSOCK", 88);
-        builtinConstants.put("EDESTADDRREQ", 89);
-        builtinConstants.put("EMSGSIZE", 90);
-        builtinConstants.put("EPROTOTYPE", 91);
-        builtinConstants.put("ENOPROTOOPT", 92);
-        builtinConstants.put("EPROTONOSUPPORT", 93);
-        builtinConstants.put("ESOCKTNOSUPPORT", 94);
-        builtinConstants.put("EOPNOTSUPP", 95);
-        builtinConstants.put("EPFNOSUPPORT", 96);
-        builtinConstants.put("EAFNOSUPPORT", 97);
-        builtinConstants.put("EADDRINUSE", 98);
-        builtinConstants.put("EADDRNOTAVAIL", 99);
-        builtinConstants.put("ENETDOWN", 100);
-        builtinConstants.put("ENETUNREACH", 101);
-        builtinConstants.put("ENETRESET", 102);
-        builtinConstants.put("ECONNABORTED", 103);
-        builtinConstants.put("ECONNRESET", 104);
-        builtinConstants.put("ENOBUFS", 105);
-        builtinConstants.put("EISCONN", 106);
-        builtinConstants.put("ENOTCONN", 107);
-        builtinConstants.put("ESHUTDOWN", 108);
-        builtinConstants.put("ETOOMANYREFS", 109);
-        builtinConstants.put("ETIMEDOUT", 110);
-        builtinConstants.put("ECONNREFUSED", 111);
-        builtinConstants.put("EHOSTDOWN", 112);
-        builtinConstants.put("EHOSTUNREACH", 113);
-        builtinConstants.put("EALREADY", 114);
-        builtinConstants.put("EINPROGRESS", 115);
-        builtinConstants.put("ESTALE", 116);
-        builtinConstants.put("EUCLEAN", 117);
-        builtinConstants.put("ENOTNAM", 118);
-        builtinConstants.put("ENAVAIL", 119);
-        builtinConstants.put("EISNAM", 120);
-        builtinConstants.put("EREMOTEIO", 121);
-        builtinConstants.put("EDQUOT", 122);
-        builtinConstants.put("ENOMEDIUM", 123);
-        builtinConstants.put("EMEDIUMTYPE", 124);
-        builtinConstants.put("ECANCELED", 125);
-        builtinConstants.put("ENOKEY", 126);
-        builtinConstants.put("EKEYEXPIRED", 127);
-        builtinConstants.put("EKEYREVOKED", 128);
-        builtinConstants.put("EKEYREJECTED", 129);
-        builtinConstants.put("EOWNERDEAD", 130);
-        builtinConstants.put("ENOTRECOVERABLE", 131);
-        builtinConstants.put("ERFKILL", 132);
-        builtinConstants.put("EHWPOISON", 133);
+        PDict errorCode = core.factory().createDict();
 
-        // added manually
-        builtinConstants.put("EAGAIN", 11);
-        builtinConstants.put("EWOULDBLOCK", 11);
+        for (OSErrorEnum value : OSErrorEnum.values()) {
+            // if more OSError have the same number -> the last one wins
+            addConstant(value.getNumber(), value.name(), errorCode);
+        }
+
+        // publish the dictionary with mapping code -> string name
+        builtinConstants.put("errorcode", errorCode);
+    }
+
+    private void addConstant(int number, String name, PDict dict) {
+        builtinConstants.put(name, number);
+        dict.setItem(number, name);
     }
 }