databind.core/: fix: Fixed a potential exception during generating the exception message when date object cannot be parsed.

NiklasRosenstein · NiklasRosenstein · commit 196544e27df1 · 2023-08-17T06:45:37.000Z
diff --git a/databind.core/.changelog/_unreleased.toml b/databind.core/.changelog/_unreleased.toml
@@ -0,0 +1,5 @@
+[[entries]]
+id = "0484f896-617e-450e-8835-6bcd6f8acc80"
+type = "fix"
+description = "Fixed a potential exception during generating the exception message when date object cannot be parsed."
+author = "@NiklasRosenstein"
diff --git a/databind.core/src/databind/core/settings.py b/databind.core/src/databind/core/settings.py
@@ -5,13 +5,12 @@
 import enum
 import typing as t
 
+from nr.date import date_format, datetime_format, format_set, time_format
 from typeapi import AnnotatedTypeHint, ClassTypeHint, TypeHint
 
 from databind.core.utils import T, check_instance_of, check_not_none, check_subclass_of
 
 if t.TYPE_CHECKING:
-    from nr.date import date_format, datetime_format, format_set, time_format
-
     from databind.core.context import Context
     from databind.core.converter import Converter
     from databind.core.union import EntrypointUnionMembers, ImportUnionMembers, StaticUnionMembers, UnionMembers
@@ -581,8 +580,9 @@ def __iter_formats(self, type_: t.Type[Formatter]) -> t.Iterable[Formatter]:
             if isinstance(fmt, str):
                 if fmt.startswith("."):
                     yield self.__get_builtin_format(fmt)
-                yield type_.compile(fmt)  # type: ignore
-            elif type(fmt) == type_:
+                else:
+                    yield type_.compile(fmt)  # type: ignore
+            elif type(fmt) is type_:
                 yield fmt
             elif isinstance(fmt, format_set):
                 yield from getattr(fmt, type_.__name__ + "s")
@@ -644,9 +644,10 @@ def format(self, dt: T_Dtype) -> str:
         raise self._formulate_parse_error(list(self.__iter_formats(format_t)), dt)
 
     @staticmethod
-    def _formulate_parse_error(formats: t.Sequence[t.Any], s: t.Any) -> ValueError:
+    def _formulate_parse_error(formats: t.Sequence[Formatter], s: t.Any) -> ValueError:
         return ValueError(
-            f'"{s}" does not match date formats ({len(formats)}):' + "".join(f"\n  | {x.format_str}" for x in formats)
+            f'"{s}" does not match date formats ({len(formats)}):'
+            + "".join(f"\n  | {str(x) if isinstance(x, format_set) else x.format_str}" for x in formats)
         )
 
 
