Fix handling of non-class & non-string annotations in dataclass

Fix: #86

Author: penguinolog

logwrap/repr_utils.py

@@ -27,6 +27,7 @@
 import types
 from inspect import Parameter
 from inspect import Signature
+from inspect import isclass
 from inspect import signature
 from typing import TYPE_CHECKING
 from typing import Any
@@ -469,8 +470,12 @@ def _repr_dataclass(
             if field.type:
                 if isinstance(field.type, str):
                     comment.append(f"type: {field.type}")
-                else:
+                elif isinstance(field.type, ForwardRef):
+                    comment.append(f"type: {field.type!r}")
+                elif isclass(field.type):
                     comment.append(f"type: {field.type.__name__}")
+                else:
+                    comment.append(f"type: {field.type!r}")
             if getattr(field, "kw_only", False):  # python 3.10+
                 comment.append("kw_only")
 

test/test_log_wrap.py

@@ -18,6 +18,9 @@
 
 """Python independent logwrap tests."""
 
+from __future__ import annotations
+
+import dataclasses
 import functools
 import io
 import logging
@@ -612,6 +615,33 @@ def func():
         )
         # fmt: on
 
+    def test_025_union_ann_call_arg(self):
+        @dataclasses.dataclass
+        class WithUnionAnn:
+            a: int | None
+
+        @logwrap.logwrap
+        def func(val: WithUnionAnn) -> WithUnionAnn:
+            return val
+
+        func(WithUnionAnn(1))
+        # fmt: off
+        self.assertEqual(
+            "DEBUG>Calling: \n"
+            "func(\n"
+            "    # POSITIONAL_OR_KEYWORD:\n"
+            "    val=test_log_wrap.WithUnionAnn(\n"
+            "        a=1,  # type: int | None\n"
+            "    ),  # type: WithUnionAnn\n"
+            ")\n"
+            "DEBUG>Done: 'func' with result:\n"
+            "test_log_wrap.WithUnionAnn(\n"
+            "    a=1,  # type: int | None\n"
+            ")\n",
+            self.stream.getvalue(),
+        )
+        # fmt: on
+
 
 # noinspection PyMissingOrEmptyDocstring
 class TestObject(unittest.TestCase):

test/test_repr_utils.py

@@ -334,6 +334,19 @@ def test_005_deque(self):
             logwrap.pretty_repr(default_deque),
         )
 
+    def tests_006_union_ann(self):
+        @dataclasses.dataclass
+        class WithUnionAnn:
+            a: int | None
+
+        test_dc = WithUnionAnn(None)
+        self.assertEqual(
+            "test_repr_utils.WithUnionAnn(\n"
+            "    a=None,  # type: int | None\n"
+            ")",
+            logwrap.pretty_repr(test_dc),
+        )
+
 
 class TestRich(unittest.TestCase):
     class Bird: