[GR-23226] More fixes for test_exceptions

PullRequest: graalpython/1011

Author: msimacek

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

@@ -728,19 +728,26 @@ PCode compile(VirtualFrame frame, PBytes source, String filename, String mode, O
         @Specialization
         @TruffleBoundary
         PCode compile(String expression, String filename, String mode, Object kwFlags, Object kwDontInherit, Object kwOptimize) {
+            String code = expression;
             PythonContext context = getContext();
             ParserMode pm;
             if (mode.equals("exec")) {
                 pm = ParserMode.File;
+                // CPython adds a newline and we need to do the same in order to produce
+                // SyntaxError with the same offset when the line is incomplete
+                if (!code.endsWith("\n")) {
+                    code += '\n';
+                }
             } else if (mode.equals("eval")) {
                 pm = ParserMode.Eval;
             } else if (mode.equals("single")) {
                 pm = ParserMode.Statement;
             } else {
                 throw raise(ValueError, ErrorMessages.COMPILE_MUST_BE);
             }
+            final String codeToCompile = code;
             Supplier<CallTarget> createCode = () -> {
-                Source source = PythonLanguage.newSource(context, expression, filename, mayBeFromFile);
+                Source source = PythonLanguage.newSource(context, codeToCompile, filename, mayBeFromFile);
                 return Truffle.getRuntime().createCallTarget((RootNode) getCore().getParser().parse(pm, getCore(), source, null));
             };
             RootCallTarget ct;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/BaseExceptionBuiltins.java

@@ -90,6 +90,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     public abstract static class InitNode extends PythonBuiltinNode {
         @Specialization(guards = "args.length == 0")
         Object initNoArgs(@SuppressWarnings("unused") PBaseException self, @SuppressWarnings("unused") Object[] args) {
+            self.setArgs(null);
             return PNone.NONE;
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonParserImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -25,10 +25,9 @@
  */
 package com.oracle.graal.python.parser;
 
-import com.oracle.graal.python.builtins.objects.PNone;
-import com.oracle.graal.python.builtins.objects.exception.PBaseException;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.Token;
 
 import com.oracle.graal.python.parser.antlr.DescriptiveBailErrorListener;
 import com.oracle.graal.python.parser.antlr.Python3Lexer;
@@ -40,14 +39,12 @@
 import com.oracle.graal.python.runtime.PythonParser;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.TruffleException;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
-import org.antlr.v4.runtime.Token;
 
 public final class PythonParserImpl implements PythonParser {
 
@@ -152,18 +149,18 @@ public Node parseN(ParserMode mode, ParserErrorCallback errors, Source source, F
                     parser.reset();
                     parserSSTResult = parser.eval_input().result;
                 } catch (Exception e2) {
-                    throw handleParserError(errors, source, e, !(mode == ParserMode.InteractiveStatement || mode == ParserMode.Statement));
+                    throw handleParserError(errors, source, e);
                 }
             } else {
-                throw handleParserError(errors, source, e, !(mode == ParserMode.InteractiveStatement || mode == ParserMode.Statement));
+                throw handleParserError(errors, source, e);
             }
         }
 
         lastGlobalScope = sstFactory.getScopeEnvironment().getGlobalScope();
         try {
             return sstFactory.createParserResult(parserSSTResult, mode, currentFrame);
         } catch (Exception e) {
-            throw handleParserError(errors, source, e, !(mode == ParserMode.InteractiveStatement || mode == ParserMode.Statement));
+            throw handleParserError(errors, source, e);
         }
     }
 
@@ -197,20 +194,11 @@ public String unescapeJavaString(String str) {
         return StringUtils.unescapeJavaString(str);
     }
 
-    private static PException handleParserError(ParserErrorCallback errors, Source source, Exception e, boolean showBadLine) {
-        if (e instanceof TruffleException && ((TruffleException) e).isSyntaxError() && e instanceof PException) {
-            if (!showBadLine) {
-                PBaseException instance = ((PException) e).getExceptionObject();
-                // In cpython shell the line with the error is not displayed, so we should do it in
-                // the same way.
-                // This rely on implementation in traceback.py file. See comment in
-                // Python3Core.raiseInvalidSyntax method
-                instance.setAttribute("text", PNone.NONE);
-            }
-            return (PException) e;
+    private static PException handleParserError(ParserErrorCallback errors, Source source, Exception e) {
+        if (e instanceof PException && ((PException) e).isSyntaxError()) {
+            throw (PException) e;
         }
-
-        SourceSection section = showBadLine ? PythonErrorStrategy.getPosition(source, e) : source.createUnavailableSection();
+        SourceSection section = PythonErrorStrategy.getPosition(source, e);
         // from parser we are getting RuntimeExceptions
         String message = e instanceof RuntimeException && e.getMessage() != null ? e.getMessage() : "invalid syntax";
         throw errors.raiseInvalidSyntax(source, section, message);

graalpython/lib-graalpython/exceptions.py

@@ -55,8 +55,12 @@ def SystemExit__init__(self, *args):
 SystemExit.__init__ = SystemExit__init__
 del SystemExit__init__
 
-def ImportError__init__(self, msg=None, /, *args, name=None, path=None):
-    self.msg = msg
+def ImportError__init__(self, *args, name=None, path=None, **kwargs):
+    if kwargs:
+        kwarg = next(iter(kwargs))
+        raise TypeError(f"'{kwarg}' is an invalid keyword argument for ImportError")
+    BaseException.__init__(self, *args)
+    self.msg = args[0] if args else None
     self.name = name
     self.path = path
 
@@ -116,8 +120,25 @@ def UnicodeEncodeError__init__(self, encoding, object, start, end, reason):
     self.reason = reason
 
 
+def UnicodeEncodeError__str__(self):
+    if not hasattr(self, 'object'):
+        return ""
+    if self.start < len(self.object) and self.start + 1 == self.end:
+        badchar = ord(self.object[self.start])
+        if badchar <= 0xff:
+            fmt = "'%s' codec can't encode character '\\x%02x' in position %d: %s"
+        elif badchar <= 0xffff:
+            fmt = "'%s' codec can't encode character '\\u%04x' in position %d: %s"
+        else:
+            fmt = "'%s' codec can't encode character '\\U%08x' in position %d: %s"
+        return fmt % (self.encoding, badchar, self.start, self.reason)
+    return "'%s' codec can't encode characters in position %d-%d: %s" % (self.encoding, self.start, self.end - 1, self.reason)
+
+
 UnicodeEncodeError.__init__ = UnicodeEncodeError__init__
+UnicodeEncodeError.__str__ = UnicodeEncodeError__str__
 del UnicodeEncodeError__init__
+del UnicodeEncodeError__str__
 
 
 def UnicodeDecodeError__init__(self, encoding, object, start, end, reason):
@@ -131,9 +152,28 @@ def UnicodeDecodeError__init__(self, encoding, object, start, end, reason):
     self.end = end
     self.reason = reason
 
+def UnicodeEncodeError__init__(self, encoding, object, start, end, reason):
+    BaseException.__init__(self, encoding, object, start, end, reason)
+    self.encoding = encoding
+    self.object = object
+    self.start = start
+    self.end = end
+    self.reason = reason
+
+
+def UnicodeDecodeError__str__(self):
+    if not hasattr(self, 'object'):
+        return ""
+    if self.start < len(self.object) and self.start + 1 == self.end:
+        byte = self.object[self.start]
+        return "'%s' codec can't decode byte 0x%02x in position %d: %s" % (self.encoding, byte, self.start, self.reason)
+    return "'%s' codec can't decode bytes in position %d-%d: %s" % (self.encoding, self.start, self.end - 1, self.reason)
+
 
 UnicodeDecodeError.__init__ = UnicodeDecodeError__init__
+UnicodeDecodeError.__str__ = UnicodeDecodeError__str__
 del UnicodeDecodeError__init__
+del UnicodeDecodeError__str__
 
 
 def UnicodeTranslateError__init__(self, object, start, end, reason):
@@ -143,8 +183,25 @@ def UnicodeTranslateError__init__(self, object, start, end, reason):
     self.reason = reason
 
 
+def UnicodeTranslateError__str__(self):
+    if not hasattr(self, 'object'):
+        return ""
+    if self.start < len(self.object) and self.start + 1 == self.end:
+        badchar = ord(self.object[self.start])
+        if badchar <= 0xff:
+            fmt = "can't translate character '\\x%02x' in position %d: %s"
+        elif badchar <= 0xffff:
+            fmt = "can't translate character '\\u%04x' in position %d: %s"
+        else:
+            fmt = "can't translate character '\\U%08x' in position %d: %s"
+        return fmt % (badchar, self.start, self.reason)
+    return "can't translate characters in position %d-%d: %s" % (self.start, self.end - 1, self.reason)
+
+
 UnicodeTranslateError.__init__ = UnicodeTranslateError__init__
+UnicodeTranslateError.__str__ = UnicodeTranslateError__str__
 del UnicodeTranslateError__init__
+del UnicodeTranslateError__str__
 
 
 # These errors are just an alias of OSError (i.e. 'EnvironmentError is OSError == True')

graalpython/lib-graalpython/sys.py

@@ -184,7 +184,13 @@ def simple_print_traceback(e):
     def __print_traceback__(typ, value, tb):
         try:
             import traceback
-            traceback.print_exception(typ, value, tb)
+            lines = traceback.format_exception(typ, value, tb)
+            # CPython's C traceback printer diverges from traceback.print_exception in this small detail.
+            # We'd like to contribute to CPython to fix the divergence, but for now we do just
+            # a string substitution to pass the tests
+            lines[-1] = lines[-1].replace(f'<unprintable {typ.__name__} object>', f'<exception str() failed>')
+            for line in lines:
+                print(line, file=stderr, end="")
         except BaseException as exc:
             print("Error in sys.excepthook:\n", file=stderr)
             simple_print_traceback(exc)

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

@@ -587,6 +587,7 @@ def testExceptionCleanupNames(self):
             del e
         self.assertNotIn('e', locals())
 
+    @support.impl_detail("refcounting", graalvm=False)
     def testExceptionCleanupState(self):
         # Make sure exception state is cleaned up as soon as the except
         # block is left. See #2507
@@ -831,6 +832,7 @@ def run_gen():
         gc_collect()
         self.assertEqual(sys.exc_info(), (None, None, None))
 
+    @support.impl_detail("refcounting", graalvm=False)
     def _check_generator_cleanup_exc_state(self, testfunc):
         # Issue #12791: exception state is cleaned up as soon as a generator
         # is closed (reference cycles are broken).
@@ -893,6 +895,7 @@ def do_send(g):
                 self.fail("should have raised StopIteration")
         self._check_generator_cleanup_exc_state(do_send)
 
+    @support.impl_detail("refcounting", graalvm=False)
     def test_3114(self):
         # Bug #3114: in its destructor, MyObject retrieves a pointer to
         # obsolete and/or deallocated objects.
@@ -1163,6 +1166,7 @@ def inner():
         self.assertEqual(wr(), None)
 
     @no_tracing
+    @support.impl_detail("refcounting", graalvm=False)
     def test_recursion_error_cleanup(self):
         # Same test as above, but with "recursion exceeded" errors
         class C:
@@ -1188,6 +1192,7 @@ def test_errno_ENOTDIR(self):
             os.listdir(__file__)
         self.assertEqual(cm.exception.errno, errno.ENOTDIR, cm.exception)
 
+    @support.impl_detail("refcounting", graalvm=False)
     def test_unraisable(self):
         # Issue #22836: PyErr_WriteUnraisable() should give sensible reports
         class BrokenDel: