Ticket #37110: zoneinfo-patch.diff

django/conf/__init__.py

@@ -10 +10 @@
 import os
 import time
 import warnings
-from pathlib import Path
+import zoneinfo
 
 from django.conf import global_settings
 from django.core.exceptions import ImproperlyConfigured
@@ -276 +276 @@
             )
 
         if hasattr(time, "tzset") and self.TIME_ZONE:
-            # When we can, attempt to validate the timezone. If we can't find
-            # this file, no check happens and it's harmless.
-            zoneinfo_root = Path("/usr/share/zoneinfo")
-            zone_info_file = zoneinfo_root.joinpath(*self.TIME_ZONE.split("/"))
-            if zoneinfo_root.exists() and not zone_info_file.exists():
+            try:
+                zoneinfo.ZoneInfo(self.TIME_ZONE)
+            except zoneinfo.ZoneInfoNotFoundError:
                 raise ValueError("Incorrect timezone setting: %s" % self.TIME_ZONE)
             # Move the time zone info into os.environ. See ticket #2315 for why
             # we don't do this unconditionally (breaks Windows).