summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
Diffstat (limited to 'Lib')
-rw-r--r--Lib/doctest.py6
-rw-r--r--Lib/test/test_doctest.py18
2 files changed, 23 insertions, 1 deletions
diff --git a/Lib/doctest.py b/Lib/doctest.py
index f00d935..2f14aa0 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -1399,10 +1399,14 @@ class DocTestRunner:
# we don't care about the carets / suggestions / etc
# We only care about the error message and notes.
# They start with `SyntaxError:` (or any other class name)
+ exception_line_prefixes = (
+ f"{exception[0].__qualname__}:",
+ f"{exception[0].__module__}.{exception[0].__qualname__}:",
+ )
exc_msg_index = next(
index
for index, line in enumerate(formatted_ex)
- if line.startswith(f"{exception[0].__name__}:")
+ if line.startswith(exception_line_prefixes)
)
formatted_ex = formatted_ex[exc_msg_index:]
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
index 5c59b00..cb4e215 100644
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -3310,6 +3310,24 @@ def test_syntax_error_with_note(cls, multiline=False):
raise exc
+def test_syntax_error_subclass_from_stdlib():
+ """
+ `ParseError` is a subclass of `SyntaxError`, but it is not a builtin:
+
+ >>> test_syntax_error_subclass_from_stdlib()
+ Traceback (most recent call last):
+ ...
+ xml.etree.ElementTree.ParseError: error
+ error
+ Note
+ Line
+ """
+ from xml.etree.ElementTree import ParseError
+ exc = ParseError("error\nerror")
+ exc.add_note('Note\nLine')
+ raise exc
+
+
def test_syntax_error_with_incorrect_expected_note():
"""
>>> def f(x):