Merged Django 1.8 changes from Surgo. May need to clean up landscape.io warnings via ignoring lines with #noqa due to the unique nature of SubfieldBase.

Author: Surgo

setup.py

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

tests/test_invalid_timezonefield.py

@@ -26,3 +26,24 @@ def test_location_max_length(self):
     def test_bad_location_default_string(self):
         with self.assertRaises(ValidationError):
             TZWithBadStringDefault.objects.create()
+
+    def test_run_validators(self):
+        with self.assertRaises(ValidationError):
+            TZWithLowMaxLength._meta.get_field('timezone').run_validators('Bad')
+
+    def test_validate(self):
+        instance = TZWithLowMaxLength.objects.create(timezone='US/Eastern')
+        with self.assertRaises(ValidationError):
+            TZWithLowMaxLength._meta.get_field('timezone').validate(
+                value='Bad',
+                model_instance=instance
+            )
+
+    def test_validate_no_error(self):
+        instance = TZWithLowMaxLength.objects.create(timezone='US/Eastern')
+        self.assertIsNone(
+            obj=TZWithLowMaxLength._meta.get_field('timezone').validate(
+                value='US/Eastern',
+                model_instance=instance
+            )
+        )

tests/test_valid_timezonefield.py

@@ -48,6 +48,7 @@ def test_location_object_set_invalid_object_string(self):
         location = LocationTimeZone.objects.get(timezone='US/Eastern')
         with self.assertRaises(ValidationError):
             location.timezone = 'Bad/Timezone'
+            location.save()
 
     def test_location_is_equals_correct_timezone(self):
         """Location should return a datetime.tzinfo instance, not a string."""

timezone_utils/fields.py

@@ -8,12 +8,13 @@
 import warnings
 
 # Django
+import django
 try:
     from django.core import checks
 except ImportError:     # pragma: no cover
     pass
 from django.core.exceptions import ValidationError
-from django.db.models import SubfieldBase
+from django.db import models
 from django.db.models.fields import DateTimeField, CharField
 from django.utils.six import with_metaclass
 from django.utils.timezone import get_default_timezone, is_naive, make_aware
@@ -22,13 +23,16 @@
 # App
 from timezone_utils import forms
 
+
+TimeZoneFieldBase = type if django.VERSION >= (1, 8) else models.SubfieldBase
+
 __all__ = ('TimeZoneField', 'LinkedTZDateTimeField')
 
 
 # ==============================================================================
 # MODEL FIELDS
 # ==============================================================================
-class TimeZoneField(with_metaclass(SubfieldBase, CharField)):
+class TimeZoneField(with_metaclass(TimeZoneFieldBase, CharField)):
     # Enforce the minimum length of max_length to be the length of the longest
     #   pytz timezone string
     MIN_LENGTH = max(map(len, pytz.all_timezones))
@@ -58,16 +62,43 @@ def __init__(self, *args, **kwargs):
 
         super(TimeZoneField, self).__init__(*args, **kwargs)
 
+    def validate(self, value, model_instance):
+        """
+        Validates value and throws ValidationError. Subclasses should override
+        this to provide validation logic.
+        """
+        super(TimeZoneField, self).validate(
+            value=self.get_prep_value(value),
+            model_instance=model_instance
+        )
+
+        # Insure the value is can be converted to a timezone
+        self.to_python(value)
+
+    def run_validators(self, value):
+        super(TimeZoneField, self).run_validators(self.get_prep_value(value))
+
     def get_prep_value(self, value):
         """Converts timezone instances to strings for db storage."""
+        value = super(TimeZoneField, self).get_prep_value(value)
 
         if isinstance(value, tzinfo):
             return value.zone
+
+        return value
+
+    def from_db_value(self, value, expression, connection, context):    # noqa
+        """
+        Converts a value as returned by the database to a Python object. It is
+        the reverse of get_prep_value(). - New in Django 1.8
+        """
+        if value:
+            value = self.to_python(value)
+
         return value
 
     def to_python(self, value):
         """Returns a datetime.tzinfo instance for the value."""
-
         value = super(TimeZoneField, self).to_python(value)
 
         if not value:
@@ -190,14 +221,19 @@ def _check_choices_attribute(self):   # pragma: no cover
         return []
 
 
-class LinkedTZDateTimeField(with_metaclass(SubfieldBase, DateTimeField)):
+class LinkedTZDateTimeField(with_metaclass(TimeZoneFieldBase, DateTimeField)):
     def __init__(self, *args, **kwargs):
         self.populate_from = kwargs.pop('populate_from', None)
         self.time_override = kwargs.pop('time_override', None)
         self.timezone = get_default_timezone()
 
         super(LinkedTZDateTimeField, self).__init__(*args, **kwargs)
 
+    def from_db_value(self, value, expression, connection, context):  # noqa
+        if value:
+            value = self.to_python(value)
+        return value
+
     def to_python(self, value):
         """Convert the value to the appropriate timezone."""
 
@@ -206,9 +242,6 @@ 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):
@@ -315,6 +348,9 @@ def _convert_value(self, value, model_instance, add):
         if self.populate_from is not None:
             tz = self._get_populate_from(model_instance)
 
+        if is_naive(value):
+            value = make_aware(value=value, timezone=tz)
+
         # 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.

timezone_utils/forms.py

@@ -8,6 +8,7 @@
 # Django
 from django.core.exceptions import ValidationError
 from django.forms import CharField
+from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 
 __all__ = ('TimeZoneField', )
@@ -21,6 +22,9 @@ class TimeZoneField(CharField):
         'invalid': _("'%(value)s' is not a valid time zone."),
     }
 
+    def run_validators(self, value):
+        return super(TimeZoneField, self).run_validators(force_text(value))
+
     def to_python(self, value):
         value = super(TimeZoneField, self).to_python(value)