Corrected a bug to where time_override caused invalid date due to not converting to the correct timezone first. Refactored conversion code. Added testing support for Django 1.8. Removed Django from setup requirements - the onus of having a supported version of Django is on the developer.

Author: michaeljohnbarr

.travis.yml

@@ -10,6 +10,7 @@ python:
 
 env:
   - DJANGO="https://github.com/django/django/archive/master.tar.gz"
+  - DJANGO="django>=1.8.0,<1.9.0"
   - DJANGO="django>=1.7.0,<1.8.0"
   - DJANGO="django>=1.6.0,<1.7.0"
   - DJANGO="django>=1.5.0,<1.6.0"
@@ -45,7 +46,7 @@ matrix:
     - python: "2.6"
       env: DJANGO="django>=1.7.0,<1.8.0"
     - python: "2.6"
-      env: DJANGO="django>=1.7.0,<1.8.0"
+      env: DJANGO="django>=1.8.0,<1.9.0""
     - python: "2.6"
       env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
     - python: "2.6"

README.rst

@@ -107,6 +107,7 @@ Contributors
 
 Changelog
 ---------
+- 0.9 Corrected a bug to where ``time_override`` caused invalid date due to not converting to the correct timezone first. Refactored conversion code. Added testing support for Django 1.8. Removed Django from setup requirements - the onus of having a supported version of Django is on the developer.
 - 0.8 Corrected a bug to where ``time_override`` caused invalid date due to not converting to the correct timezone first. Added choices ``GROUPED_ALL_TIMEZONES_CHOICES`` and ``GROUPED_COMMON_TIMEZONES_CHOICES`` to the documentation.
 - 0.7 Corrected a bug where datetime.max.time() resulted in incorrect date/time. Changed tests to compare time_override models via string to prevent future regressions. Added choices ``GROUPED_ALL_TIMEZONES_CHOICES`` and ``GROUPED_COMMON_TIMEZONES_CHOICES``.
 - 0.6 Added RTD documentation. LinkedTZDateTimeField now returns the datetime object in the overidden timezone and time.

setup.py

@@ -21,7 +21,6 @@
     packages=['timezone_utils'],
     install_requires=[
         'pytz',
-        'django>=1.4,<1.8'
     ],
     zip_safe=False,
     platforms='any',

tests/test_valid_tzdatetimefield.py

@@ -32,7 +32,7 @@ def setUp(self):
         location = TZWithGoodStringDefault.objects.create()
         ModelWithForeignKeyToTimeZone.objects.create(other_model=location)
         TZTimeFramedModel.objects.create(
-            start=make_aware(datetime(2014, 1, 1), pytz.timezone('US/Eastern')),
+            start=datetime(2014, 1, 1),
             end=make_aware(datetime(2014, 12, 31), pytz.timezone('US/Eastern')),
             other_model=location
         )

timezone_utils/__init__.py

@@ -1,2 +1,2 @@
-__version__ = (0, 8)
+__version__ = (0, 9)
 VERSION = '.'.join(map(str, __version__))

timezone_utils/fields.py

@@ -206,6 +206,9 @@ def to_python(self, value):
         if not value:
             return value
 
+        if is_naive(value):
+            return make_aware(value=value, timezone=self.timezone)
+
         return value.astimezone(self.timezone)
 
     def pre_save(self, model_instance, add):
@@ -312,6 +315,11 @@ def _convert_value(self, value, model_instance, add):
         if self.populate_from is not None:
             tz = self._get_populate_from(model_instance)
 
+        # Convert the value to a datetime object in the correct timezone. This
+        # insures that we will have the correct date if we are performing a time
+        #   override below.
+        value = value.astimezone(tz)
+
         # Do not convert the time to the time override if auto_now or
         #   auto_now_add is set
         if self.time_override is not None and not (
@@ -320,24 +328,13 @@ def _convert_value(self, value, model_instance, add):
             # Retrieve the time override
             time_override = self._get_time_override()
 
-            # Convert the value to the correct timezone prior to applying the
-            #   time_override
-            if not value.tzinfo == tz:
-                value = value.astimezone(tz)
-
-            # Convert the value to the date/time
-            value = datetime.combine(
-                date=value.date(),
-                time=time_override
+            # Convert the value to the date/time with the appropriate timezone
+            value = make_aware(
+                value=datetime.combine(
+                    date=value.date(),
+                    time=time_override
+                ),
+                timezone=tz
             )
 
-        # If the value is naive (due to the time_override conversion), make it
-        #   aware based on the appropriate timezone
-        if is_naive(value):
-            value = make_aware(value=value, timezone=tz)
-
-        # Set the value to the correct timezone
-        if not value.tzinfo == tz:
-            value = value.astimezone(tz)
-
         return value