Fixed #30608 -- Fixed non-unicode EmailMessage crash when domain name for localhost is non-ASCII.

Assisted by felixxm.

1 files changed, 3 insertions, 1 deletions

diff --git a/django/core/mail/utils.py b/django/core/mail/utils.py
index d18dfe4667..1e48faa366 100644
--- a/django/core/mail/utils.py
+++ b/django/core/mail/utils.py
@@ -4,6 +4,8 @@ Email message and email sending related helper functions.
 
 import socket
 
+from django.utils.encoding import punycode
+
 
 # Cache the hostname, but do it lazily: socket.getfqdn() can take a couple of
 # seconds, which slows down the restart of the server.
@@ -13,7 +15,7 @@ class CachedDnsName:
 
     def get_fqdn(self):
         if not hasattr(self, '_fqdn'):
-            self._fqdn = socket.getfqdn()
+            self._fqdn = punycode(socket.getfqdn())
         return self._fqdn