Fix ZoneInfo with various invalid types (#10408)

pydantic · Sep 17, 2024 · c0a288f · c0a288f
1 parent ea6115d
commit c0a288f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/pydantic/_internal/_generate_schema.py b/pydantic/_internal/_generate_schema.py
@@ -1657,7 +1657,7 @@ def validate_str_is_valid_iana_tz(value: Any, /) -> ZoneInfo:
                 return value
             try:
                 return ZoneInfo(value)
-            except (ZoneInfoNotFoundError, ValueError):
+            except (ZoneInfoNotFoundError, ValueError, TypeError):
                 raise PydanticCustomError('zoneinfo_str', 'invalid timezone: {value}', {'value': value})
 
         metadata = build_metadata_dict(js_functions=[lambda _1, _2: {'type': 'string', 'format': 'zoneinfo'}])

diff --git a/tests/test_types_zoneinfo.py b/tests/test_types_zoneinfo.py
@@ -1,6 +1,9 @@
+from datetime import timezone
+from typing import Union
+
 import pytest
 
-from pydantic import BaseModel, ValidationError
+from pydantic import BaseModel, ConfigDict, TypeAdapter, ValidationError
 
 zoneinfo = pytest.importorskip('zoneinfo', reason='zoneinfo requires >=3.9')
 
@@ -48,3 +51,8 @@ def test_zoneinfo_json_schema():
         'properties': {'tz': {'type': 'string', 'format': 'zoneinfo', 'title': 'Tz'}},
         'required': ['tz'],
     }
+
+
+def test_zoneinfo_union() -> None:
+    ta = TypeAdapter(Union[zoneinfo.ZoneInfo, timezone], config=ConfigDict(arbitrary_types_allowed=True))
+    assert ta.validate_python(timezone.utc) is timezone.utc