Version 0.6.3: Fixed MultipleExceptions.merge raising TracedException.

Author: chrilves

conda/raffiot/meta.yaml

@@ -1,5 +1,5 @@
 {% set name = "raffiot" %}
-{% set version = "0.6.2" %}
+{% set version = "0.6.3" %}
 
 package:
   name: "{{ name|lower }}"

docs/api/index.html

@@ -1068,10 +1068,8 @@ <h3>Class variables</h3>
             if isinstance(item, abc.Iterable) and not isinstance(item, str):
                 stack.extend(item)
                 continue
-            base_exceptions.append(item)
+            base_exceptions.append(TracedException.ensure_traced(item))
 
-        if len(base_exceptions) == 1:
-            return base_exceptions[0]
         base_exceptions.reverse()
         return MultipleExceptions(base_exceptions, errs)
 
@@ -1139,10 +1137,8 @@ <h3>Static methods</h3>
         if isinstance(item, abc.Iterable) and not isinstance(item, str):
             stack.extend(item)
             continue
-        base_exceptions.append(item)
+        base_exceptions.append(TracedException.ensure_traced(item))
 
-    if len(base_exceptions) == 1:
-        return base_exceptions[0]
     base_exceptions.reverse()
     return MultipleExceptions(base_exceptions, errs)</code></pre>
 </details>

docs/api/untyped/index.html

@@ -1047,10 +1047,8 @@ <h3>Class variables</h3>
             if isinstance(item, abc.Iterable) and not isinstance(item, str):
                 stack.extend(item)
                 continue
-            base_exceptions.append(item)
+            base_exceptions.append(TracedException.ensure_traced(item))
 
-        if len(base_exceptions) == 1:
-            return base_exceptions[0]
         base_exceptions.reverse()
         return MultipleExceptions(base_exceptions, errs)
 
@@ -1117,10 +1115,8 @@ <h3>Static methods</h3>
         if isinstance(item, abc.Iterable) and not isinstance(item, str):
             stack.extend(item)
             continue
-        base_exceptions.append(item)
+        base_exceptions.append(TracedException.ensure_traced(item))
 
-    if len(base_exceptions) == 1:
-        return base_exceptions[0]
     base_exceptions.reverse()
     return MultipleExceptions(base_exceptions, errs)</code></pre>
 </details>

docs/api/untyped/utils.html

@@ -145,10 +145,8 @@ <h1 class="title">Module <code>raffiot.untyped.utils</code></h1>
             if isinstance(item, abc.Iterable) and not isinstance(item, str):
                 stack.extend(item)
                 continue
-            base_exceptions.append(item)
+            base_exceptions.append(TracedException.ensure_traced(item))
 
-        if len(base_exceptions) == 1:
-            return base_exceptions[0]
         base_exceptions.reverse()
         return MultipleExceptions(base_exceptions, errs)
 
@@ -368,10 +366,8 @@ <h3>Class variables</h3>
             if isinstance(item, abc.Iterable) and not isinstance(item, str):
                 stack.extend(item)
                 continue
-            base_exceptions.append(item)
+            base_exceptions.append(TracedException.ensure_traced(item))
 
-        if len(base_exceptions) == 1:
-            return base_exceptions[0]
         base_exceptions.reverse()
         return MultipleExceptions(base_exceptions, errs)
 
@@ -438,10 +434,8 @@ <h3>Static methods</h3>
         if isinstance(item, abc.Iterable) and not isinstance(item, str):
             stack.extend(item)
             continue
-        base_exceptions.append(item)
+        base_exceptions.append(TracedException.ensure_traced(item))
 
-    if len(base_exceptions) == 1:
-        return base_exceptions[0]
     base_exceptions.reverse()
     return MultipleExceptions(base_exceptions, errs)</code></pre>
 </details>

docs/api/utils.html

@@ -153,10 +153,8 @@ <h1 class="title">Module <code>raffiot.utils</code></h1>
             if isinstance(item, abc.Iterable) and not isinstance(item, str):
                 stack.extend(item)
                 continue
-            base_exceptions.append(item)
+            base_exceptions.append(TracedException.ensure_traced(item))
 
-        if len(base_exceptions) == 1:
-            return base_exceptions[0]
         base_exceptions.reverse()
         return MultipleExceptions(base_exceptions, errs)
 
@@ -382,10 +380,8 @@ <h3>Class variables</h3>
             if isinstance(item, abc.Iterable) and not isinstance(item, str):
                 stack.extend(item)
                 continue
-            base_exceptions.append(item)
+            base_exceptions.append(TracedException.ensure_traced(item))
 
-        if len(base_exceptions) == 1:
-            return base_exceptions[0]
         base_exceptions.reverse()
         return MultipleExceptions(base_exceptions, errs)
 
@@ -453,10 +449,8 @@ <h3>Static methods</h3>
         if isinstance(item, abc.Iterable) and not isinstance(item, str):
             stack.extend(item)
             continue
-        base_exceptions.append(item)
+        base_exceptions.append(TracedException.ensure_traced(item))
 
-    if len(base_exceptions) == 1:
-        return base_exceptions[0]
     base_exceptions.reverse()
     return MultipleExceptions(base_exceptions, errs)</code></pre>
 </details>

raffiot/utils.py

@@ -125,10 +125,8 @@ def merge(cls, *exceptions: TracedException, errors: List[E] = None) -> Exceptio
             if isinstance(item, abc.Iterable) and not isinstance(item, str):
                 stack.extend(item)
                 continue
-            base_exceptions.append(item)
+            base_exceptions.append(TracedException.ensure_traced(item))
 
-        if len(base_exceptions) == 1:
-            return base_exceptions[0]
         base_exceptions.reverse()
         return MultipleExceptions(base_exceptions, errs)
 

setup.py

@@ -1,7 +1,7 @@
 #! env python3
 from setuptools import setup
 
-version = "0.6.2"
+version = "0.6.3"
 
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()

tests/test_utils.py

@@ -1,35 +1,18 @@
 from unittest import TestCase
 
-from raffiot.utils import *
+import hypothesis.strategies as st
+from hypothesis import given
 
-x = 5
-y = 6
-z = 7
+from raffiot.utils import *
+from typing import List
 
 
 def test_sequence():
-    assert seq(x, y, z) == z
-
-
-class TestMultipleExceptions(TestCase):
-    def test_merge_none(self):
-        assert MultipleExceptions.merge() == MultipleExceptions([], [])
+    x = 5
+    y = 6
+    z = 7
 
-    def test_merge_one(self):
-        exn = MatchError(x)
-        assert MultipleExceptions.merge(exn) == exn
-
-    def test_merge_list_one(self):
-        exn = MatchError(x)
-        assert MultipleExceptions.merge([exn]) == exn
-
-    def test_merge_list_one(self):
-        exn_x = MatchError(x)
-        exn_y = MatchError(y)
-        exn_z = MatchError(z)
-        assert MultipleExceptions.merge(
-            MultipleExceptions([exn_x], []), exn_y, MultipleExceptions([exn_z], [])
-        ) == MultipleExceptions([exn_x, exn_y, exn_z], [])
+    assert seq(x, y, z) == z
 
 
 class TestTracedException(TestCase):
@@ -44,3 +27,31 @@ def test_in_with_stack_trace_itempotence(self):
     def test_in_with_ensure_traced_itempotence(self):
         exn = TracedException(MatchError(""), "")
         assert isinstance(TracedException.ensure_traced(exn).exception, MatchError)
+
+
+class TestMultipleExceptions(TestCase):
+    @given(st.lists(st.lists(st.text())))
+    def test_exns(self, l: List[str]):
+        exceptions = [TracedException(MatchError(x), "") for x in l]
+        assert MultipleExceptions.merge(*exceptions) == MultipleExceptions(
+            exceptions=exceptions, errors=[]
+        )
+
+    @given(st.lists(st.lists(st.text())))
+    def test_list_of_lists(self, l: List[List[str]]):
+        list_exceptions = [[TracedException(MatchError(x), "") for x in y] for y in l]
+        expected = [exn for y in list_exceptions for exn in y]
+        assert MultipleExceptions.merge(*list_exceptions) == MultipleExceptions(
+            exceptions=expected, errors=[]
+        )
+
+    @given(st.lists(st.lists(st.text())))
+    def test_list_of_multiple(self, l: List[List[str]]):
+        list_multiple = [
+            MultipleExceptions.merge(*[TracedException(MatchError(x), "") for x in y])
+            for y in l
+        ]
+        expected = [TracedException(MatchError(x), "") for y in l for x in y]
+        assert MultipleExceptions.merge(*list_multiple) == MultipleExceptions(
+            exceptions=expected, errors=[]
+        )