Add support for ExceptionGroup backport (through "exceptiongroup" lib)

Delgan · Sep 8, 2023 · 3f6ff51 · 3f6ff51
1 parent a91c1cc
commit 3f6ff51
Show file tree

Hide file tree

Showing 15 changed files with 165 additions and 122 deletions.
diff --git a/loguru/_better_exceptions.py b/loguru/_better_exceptions.py
@@ -16,9 +16,17 @@ def is_exception_group(exc):
         return isinstance(exc, ExceptionGroup)
 
 else:
+    try:
+        from exceptiongroup import ExceptionGroup
+    except ImportError:
 
-    def is_exception_group(exc):
-        return False
+        def is_exception_group(exc):
+            return False
+
+    else:
+
+        def is_exception_group(exc):
+            return isinstance(exc, ExceptionGroup)
 
 
 class SyntaxHighlighter:

diff --git a/setup.py b/setup.py
@@ -73,6 +73,7 @@
             "colorama==0.4.6 ; python_version>='3.8'",
             "freezegun==1.1.0 ; python_version<'3.8'",
             "freezegun==1.2.2 ; python_version>='3.8'",
+            "exceptiongroup==1.1.3; ; pythonversion>='3.7' and python_version<'3.11'"
             # Type checking.
             "mypy==v0.910 ; python_version<'3.6'",
             "mypy==v0.971 ; python_version>='3.6' and python_version<'3.7'",

diff --git a/tests/exceptions/output/modern/grouped_as_cause_and_context.txt b/tests/exceptions/output/modern/grouped_as_cause_and_context.txt
@@ -1,78 +1,78 @@
 
   + Exception Group Traceback (most recent call last):
-  |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 31, in main
+  |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 37, in main
   |     raise ExceptionGroup("group_1", [error_1, error_2])
   | ExceptionGroup: group_1 (2 sub-exceptions)
   +-+---------------- 1 ----------------
     | Traceback (most recent call last):
-    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 20, in main
+    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 26, in main
     |     a()
-    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 10, in a
+    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 16, in a
     |     1 / 0
     | ZeroDivisionError: division by zero
     +---------------- 2 ----------------
     | Traceback (most recent call last):
-    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 25, in main
+    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 31, in main
     |     b()
-    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 14, in b
+    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 20, in b
     |     raise ValueError("Error")
     | ValueError: Error
     +------------------------------------
 
 The above exception was the direct cause of the following exception:
 
   + Exception Group Traceback (most recent call last):
-  |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 33, in main
+  |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 39, in main
   |     raise ExceptionGroup("group_2", [error_2, error_1]) from err
   | ExceptionGroup: group_2 (2 sub-exceptions)
   +-+---------------- 1 ----------------
     | Traceback (most recent call last):
-    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 25, in main
+    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 31, in main
     |     b()
-    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 14, in b
+    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 20, in b
     |     raise ValueError("Error")
     | ValueError: Error
     +---------------- 2 ----------------
     | Traceback (most recent call last):
-    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 20, in main
+    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 26, in main
     |     a()
-    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 10, in a
+    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 16, in a
     |     1 / 0
     | ZeroDivisionError: division by zero
     +------------------------------------
 
 During handling of the above exception, another exception occurred:
 
   + Exception Group Traceback (most recent call last):
-  |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 42, in <module>
+  |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 48, in <module>
   |     main()
-  |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 35, in main
+  |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 41, in main
   |     raise ExceptionGroup("group_3", [err])
   | ExceptionGroup: group_3 (1 sub-exception)
   +-+---------------- 1 ----------------
     | Exception Group Traceback (most recent call last):
-    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 33, in main
+    |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 39, in main
     |     raise ExceptionGroup("group_2", [error_2, error_1]) from err
     | ExceptionGroup: group_2 (2 sub-exceptions)
     +-+---------------- 1 ----------------
       | Traceback (most recent call last):
-      |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 25, in main
+      |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 31, in main
       |     b()
-      |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 14, in b
+      |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 20, in b
       |     raise ValueError("Error")
       | ValueError: Error
       +---------------- 2 ----------------
       | Traceback (most recent call last):
-      |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 20, in main
+      |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 26, in main
       |     a()
-      |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 10, in a
+      |   File "tests/exceptions/source/modern/grouped_as_cause_and_context.py", line 16, in a
       |     1 / 0
       | ZeroDivisionError: division by zero
       +------------------------------------
 
   + [33m[1mException Group Traceback (most recent call last):[0m
   |
-  |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m31[0m, in [35mmain[0m
+  |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m37[0m, in [35mmain[0m
   |     [35m[1mraise[0m [1mExceptionGroup[0m[1m([0m[36m"group_1"[0m[1m,[0m [1m[[0m[1merror_1[0m[1m,[0m [1merror_2[0m[1m][0m[1m)[0m
   |     [36m                                 │        └ [0m[36m[1mValueError('Error')[0m
   |     [36m                                 └ [0m[36m[1mZeroDivisionError('division by zero')[0m
@@ -81,22 +81,22 @@ During handling of the above exception, another exception occurred:
   +-+---------------- 1 ----------------
     | [33m[1mTraceback (most recent call last):[0m
     |
-    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m20[0m, in [35mmain[0m
+    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m26[0m, in [35mmain[0m
     |     [1ma[0m[1m([0m[1m)[0m
     |     [36m└ [0m[36m[1m<function a at 0xDEADBEEF>[0m
     |
-    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m10[0m, in [35ma[0m
+    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m16[0m, in [35ma[0m
     |     [34m[1m1[0m [35m[1m/[0m [34m[1m0[0m
     |
     | [31m[1mZeroDivisionError[0m:[1m division by zero[0m
     +---------------- 2 ----------------
     | [33m[1mTraceback (most recent call last):[0m
     |
-    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m25[0m, in [35mmain[0m
+    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m31[0m, in [35mmain[0m
     |     [1mb[0m[1m([0m[1m)[0m
     |     [36m└ [0m[36m[1m<function b at 0xDEADBEEF>[0m
     |
-    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m14[0m, in [35mb[0m
+    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m20[0m, in [35mb[0m
     |     [35m[1mraise[0m [1mValueError[0m[1m([0m[36m"Error"[0m[1m)[0m
     |
     | [31m[1mValueError[0m:[1m Error[0m
@@ -108,7 +108,7 @@ During handling of the above exception, another exception occurred:
 
   + [33m[1mException Group Traceback (most recent call last):[0m
   |
-  |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m33[0m, in [35mmain[0m
+  |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m39[0m, in [35mmain[0m
   |     [35m[1mraise[0m [1mExceptionGroup[0m[1m([0m[36m"group_2"[0m[1m,[0m [1m[[0m[1merror_2[0m[1m,[0m [1merror_1[0m[1m][0m[1m)[0m [35m[1mfrom[0m [1merr[0m
   |     [36m                                 │        └ [0m[36m[1mZeroDivisionError('division by zero')[0m
   |     [36m                                 └ [0m[36m[1mValueError('Error')[0m
@@ -117,22 +117,22 @@ During handling of the above exception, another exception occurred:
   +-+---------------- 1 ----------------
     | [33m[1mTraceback (most recent call last):[0m
     |
-    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m25[0m, in [35mmain[0m
+    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m31[0m, in [35mmain[0m
     |     [1mb[0m[1m([0m[1m)[0m
     |     [36m└ [0m[36m[1m<function b at 0xDEADBEEF>[0m
     |
-    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m14[0m, in [35mb[0m
+    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m20[0m, in [35mb[0m
     |     [35m[1mraise[0m [1mValueError[0m[1m([0m[36m"Error"[0m[1m)[0m
     |
     | [31m[1mValueError[0m:[1m Error[0m
     +---------------- 2 ----------------
     | [33m[1mTraceback (most recent call last):[0m
     |
-    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m20[0m, in [35mmain[0m
+    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m26[0m, in [35mmain[0m
     |     [1ma[0m[1m([0m[1m)[0m
     |     [36m└ [0m[36m[1m<function a at 0xDEADBEEF>[0m
     |
-    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m10[0m, in [35ma[0m
+    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m16[0m, in [35ma[0m
     |     [34m[1m1[0m [35m[1m/[0m [34m[1m0[0m
     |
     | [31m[1mZeroDivisionError[0m:[1m division by zero[0m
@@ -144,18 +144,18 @@ During handling of the above exception, another exception occurred:
 
   + [33m[1mException Group Traceback (most recent call last):[0m
   |
-  | > File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m42[0m, in [35m<module>[0m
+  | > File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m48[0m, in [35m<module>[0m
   |     [1mmain[0m[1m([0m[1m)[0m
   |     [36m└ [0m[36m[1m<function main at 0xDEADBEEF>[0m
   |
-  |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m35[0m, in [35mmain[0m
+  |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m41[0m, in [35mmain[0m
   |     [35m[1mraise[0m [1mExceptionGroup[0m[1m([0m[36m"group_3"[0m[1m,[0m [1m[[0m[1merr[0m[1m][0m[1m)[0m
   |
   | [31m[1mExceptionGroup[0m:[1m group_3 (1 sub-exception)[0m
   +-+---------------- 1 ----------------
     | [33m[1mException Group Traceback (most recent call last):[0m
     |
-    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m33[0m, in [35mmain[0m
+    |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m39[0m, in [35mmain[0m
     |     [35m[1mraise[0m [1mExceptionGroup[0m[1m([0m[36m"group_2"[0m[1m,[0m [1m[[0m[1merror_2[0m[1m,[0m [1merror_1[0m[1m][0m[1m)[0m [35m[1mfrom[0m [1merr[0m
     |     [36m                                 │        └ [0m[36m[1mZeroDivisionError('division by zero')[0m
     |     [36m                                 └ [0m[36m[1mValueError('Error')[0m
@@ -164,22 +164,22 @@ During handling of the above exception, another exception occurred:
     +-+---------------- 1 ----------------
       | [33m[1mTraceback (most recent call last):[0m
       |
-      |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m25[0m, in [35mmain[0m
+      |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m31[0m, in [35mmain[0m
       |     [1mb[0m[1m([0m[1m)[0m
       |     [36m└ [0m[36m[1m<function b at 0xDEADBEEF>[0m
       |
-      |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m14[0m, in [35mb[0m
+      |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m20[0m, in [35mb[0m
       |     [35m[1mraise[0m [1mValueError[0m[1m([0m[36m"Error"[0m[1m)[0m
       |
       | [31m[1mValueError[0m:[1m Error[0m
       +---------------- 2 ----------------
       | [33m[1mTraceback (most recent call last):[0m
       |
-      |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m20[0m, in [35mmain[0m
+      |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m26[0m, in [35mmain[0m
       |     [1ma[0m[1m([0m[1m)[0m
       |     [36m└ [0m[36m[1m<function a at 0xDEADBEEF>[0m
       |
-      |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m10[0m, in [35ma[0m
+      |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_as_cause_and_context.py[0m", line [33m16[0m, in [35ma[0m
       |     [34m[1m1[0m [35m[1m/[0m [34m[1m0[0m
       |
       | [31m[1mZeroDivisionError[0m:[1m division by zero[0m

diff --git a/tests/exceptions/output/modern/grouped_max_depth.txt b/tests/exceptions/output/modern/grouped_max_depth.txt
@@ -1,8 +1,8 @@
 
   + Exception Group Traceback (most recent call last):
-  |   File "tests/exceptions/source/modern/grouped_max_depth.py", line 26, in <module>
+  |   File "tests/exceptions/source/modern/grouped_max_depth.py", line 31, in <module>
   |     main()
-  |   File "tests/exceptions/source/modern/grouped_max_depth.py", line 19, in main
+  |   File "tests/exceptions/source/modern/grouped_max_depth.py", line 24, in main
   |     raise ExceptionGroup("group", [nesting_left, nesting_right, nesting_both])
   | ExceptionGroup: group (3 sub-exceptions)
   +-+---------------- 1 ----------------
@@ -159,11 +159,11 @@
 
   + [33m[1mException Group Traceback (most recent call last):[0m
   |
-  | > File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_max_depth.py[0m", line [33m26[0m, in [35m<module>[0m
+  | > File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_max_depth.py[0m", line [33m31[0m, in [35m<module>[0m
   |     [1mmain[0m[1m([0m[1m)[0m
   |     [36m└ [0m[36m[1m<function main at 0xDEADBEEF>[0m
   |
-  |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_max_depth.py[0m", line [33m19[0m, in [35mmain[0m
+  |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_max_depth.py[0m", line [33m24[0m, in [35mmain[0m
   |     [35m[1mraise[0m [1mExceptionGroup[0m[1m([0m[36m"group"[0m[1m,[0m [1m[[0m[1mnesting_left[0m[1m,[0m [1mnesting_right[0m[1m,[0m [1mnesting_both[0m[1m][0m[1m)[0m
   |     [36m                               │             │              └ [0m[36m[1mExceptionGroup('group', [ValueError(-99), ExceptionGroup('group', [ValueError(-98), ExceptionGroup('group', [ValueError(-97),...[0m
   |     [36m                               │             └ [0m[36m[1mExceptionGroup('group', [ExceptionGroup('group', [ExceptionGroup('group', [ExceptionGroup('group', [ExceptionGroup('group', [...[0m

diff --git a/tests/exceptions/output/modern/grouped_max_length.txt b/tests/exceptions/output/modern/grouped_max_length.txt
@@ -1,8 +1,8 @@
 
   + Exception Group Traceback (most recent call last):
-  |   File "tests/exceptions/source/modern/grouped_max_length.py", line 15, in <module>
+  |   File "tests/exceptions/source/modern/grouped_max_length.py", line 20, in <module>
   |     main()
-  |   File "tests/exceptions/source/modern/grouped_max_length.py", line 8, in main
+  |   File "tests/exceptions/source/modern/grouped_max_length.py", line 13, in main
   |     raise ExceptionGroup("group", errors)
   | ExceptionGroup: group (100 sub-exceptions)
   +-+---------------- 1 ----------------
@@ -41,11 +41,11 @@
 
   + [33m[1mException Group Traceback (most recent call last):[0m
   |
-  | > File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_max_length.py[0m", line [33m15[0m, in [35m<module>[0m
+  | > File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_max_length.py[0m", line [33m20[0m, in [35m<module>[0m
   |     [1mmain[0m[1m([0m[1m)[0m
   |     [36m└ [0m[36m[1m<function main at 0xDEADBEEF>[0m
   |
-  |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_max_length.py[0m", line [33m8[0m, in [35mmain[0m
+  |   File "[32mtests/exceptions/source/modern/[0m[32m[1mgrouped_max_length.py[0m", line [33m13[0m, in [35mmain[0m
   |     [35m[1mraise[0m [1mExceptionGroup[0m[1m([0m[36m"group"[0m[1m,[0m [1merrors[0m[1m)[0m
   |     [36m                              └ [0m[36m[1m[ValueError(0), ValueError(1), ValueError(2), ValueError(3), ValueError(4), ValueError(5), ValueError(6), ValueError(7), Valu...[0m
   |