Fix serialization of NameEmail if name includes an email address (#8860)

pydantic · Feb 23, 2024 · deeb110 · deeb110
1 parent 16edb69
commit deeb110
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/pydantic/networks.py b/pydantic/networks.py
@@ -502,6 +502,9 @@ def _validate(cls, __input_value: NameEmail | str) -> NameEmail:
             return cls(name, email)
 
     def __str__(self) -> str:
+        if '@' in self.name:
+            return f'"{self.name}" <{self.email}>'
+
         return f'{self.name} <{self.email}>'
 
 

diff --git a/tests/test_networks.py b/tests/test_networks.py
@@ -1,3 +1,4 @@
+import json
 from typing import Union
 
 import pytest
@@ -867,3 +868,16 @@ class Model(BaseModel):
     assert exc_info.value.errors() == [
         {'input': 1, 'loc': ('v',), 'msg': 'Input is not a valid NameEmail', 'type': 'name_email_type'}
     ]
+
+
+@pytest.mark.skipif(not email_validator, reason='email_validator not installed')
+def test_name_email_serialization():
+    class Model(BaseModel):
+        email: NameEmail
+
+    m = Model.model_validate({'email': '"name@mailbox.com" <name@mailbox.com>'})
+    assert m.email.name == 'name@mailbox.com'
+    assert str(m.email) == '"name@mailbox.com" <name@mailbox.com>'
+
+    obj = json.loads(m.model_dump_json())
+    Model(email=obj['email'])