Skipped outdated timezone tests for Django 5.0.

Author: carltongibson

django_filters/utils.py

@@ -1,6 +1,8 @@
+import datetime
 import warnings
 from collections import OrderedDict
 
+import django
 from django.conf import settings
 from django.core.exceptions import FieldDoesNotExist, FieldError
 from django.db import models
@@ -229,9 +231,11 @@ def resolve_field(model_field, lookup_expr):
 
 def handle_timezone(value, is_dst=None):
     if settings.USE_TZ and timezone.is_naive(value):
-        return timezone.make_aware(value, timezone.get_current_timezone(), is_dst)
+        if django.VERSION < (5, 0):
+            return timezone.make_aware(value, timezone.get_current_timezone(), is_dst)
+        return timezone.make_aware(value, timezone.get_current_timezone())
     elif not settings.USE_TZ and timezone.is_aware(value):
-        return timezone.make_naive(value, timezone.utc)
+        return timezone.make_naive(value, datetime.timezone.utc)
     return value
 
 

tests/test_fields.py

@@ -1,6 +1,9 @@
+import datetime as dt
 import decimal
+import unittest
 from datetime import datetime, time, timedelta, tzinfo
 
+import django
 import pytz
 from django import forms
 from django.test import TestCase, override_settings
@@ -97,8 +100,8 @@ def test_clean(self):
         w = RangeWidget()
         f = IsoDateTimeRangeField(widget=w)
         expected = slice(
-            datetime(2015, 1, 1, 9, 30, 1, 123000, tzinfo=timezone.utc),
-            datetime(2015, 1, 10, 7, 45, 2, 345000, tzinfo=timezone.utc),
+            datetime(2015, 1, 1, 9, 30, 1, 123000, tzinfo=dt.timezone.utc),
+            datetime(2015, 1, 10, 7, 45, 2, 345000, tzinfo=dt.timezone.utc),
         )
         actual = f.clean(
             ["2015-01-01T10:30:01.123000+01:00", "2015-01-10T08:45:02.345000+01:00"]
@@ -178,6 +181,7 @@ def test_datetime_zulu(self):
         d = self.parse_input(self.reference_str + "Z")
         self.assertTrue(isinstance(d, datetime))
 
+    @unittest.skipUnless(django.VERSION < (5, 0), "pytz support removed in Django 5.0")
     @override_settings(TIME_ZONE="UTC")
     def test_datetime_timezone_awareness(self):
         utc, tokyo = pytz.timezone("UTC"), pytz.timezone("Asia/Tokyo")

tests/test_filtering.py

@@ -4,6 +4,7 @@
 from operator import attrgetter
 from unittest import mock
 
+import django
 from django import forms
 from django.http import QueryDict
 from django.test import TestCase, override_settings
@@ -847,6 +848,7 @@ class Meta:
         )
         self.assertEqual(len(results.qs), 3)
 
+    @unittest.skipUnless(django.VERSION < (5, 0), "is_dst removed in Django 5.0")
     @override_settings(TIME_ZONE="America/Sao_Paulo")
     def test_filtering_dst_start_midnight(self):
         tz = timezone.get_default_timezone()
@@ -875,6 +877,7 @@ class Meta:
         )
         self.assertEqual(len(results.qs), 2)
 
+    @unittest.skipUnless(django.VERSION < (5, 0), "is_dst removed in Django 5.0")
     @override_settings(TIME_ZONE="America/Sao_Paulo")
     def test_filtering_dst_ends_midnight(self):
         tz = timezone.get_default_timezone()
@@ -903,6 +906,7 @@ class Meta:
         )
         self.assertEqual(len(results.qs), 2)
 
+    @unittest.skipUnless(django.VERSION < (5, 0), "is_dst removed in Django 5.0")
     @override_settings(TIME_ZONE="Europe/Paris")
     def test_filtering_dst_start(self):
         tz = timezone.get_default_timezone()
@@ -934,6 +938,7 @@ class Meta:
         )
         self.assertEqual(len(results.qs), 3)
 
+    @unittest.skipUnless(django.VERSION < (5, 0), "is_dst removed in Django 5.0")
     @override_settings(TIME_ZONE="Europe/Paris")
     def test_filtering_dst_end(self):
         tz = timezone.get_default_timezone()

tests/test_utils.py

@@ -1,6 +1,8 @@
 import datetime
+import unittest
 import warnings
 
+import django
 from django.db import models
 from django.db.models.constants import LOOKUP_SEP
 from django.db.models.fields.related import ForeignObjectRel
@@ -513,6 +515,7 @@ def test_field_all_caps(self):
         self.assertEqual(label, "Exclude CIDR contains")
 
 
+@unittest.skipUnless(django.VERSION < (5, 0), "is_dst removed in Django 5.0")
 class HandleTimezone(TestCase):
     @override_settings(TIME_ZONE="America/Sao_Paulo")
     def test_handle_dst_ending(self):