Pylint fixes, conserving pixels

Author: mfogel

timezone_field/fields.py

@@ -1,6 +1,5 @@
 import pytz
 
-from django.conf import settings
 from django.db import models
 from django.utils.encoding import smart_unicode, smart_str
 
@@ -13,11 +12,11 @@ class TimeZoneField(models.CharField):
 
     def __init__(self, *args, **kwargs):
         defaults = {
-            "max_length": 63,
-            "choices": TimeZoneField.CHOICES,
+            'max_length': 63,
+            'choices': TimeZoneField.CHOICES,
         }
         defaults.update(kwargs)
-        return super(TimeZoneField, self).__init__(*args, **defaults)
+        super(TimeZoneField, self).__init__(*args, **defaults)
 
     def validate(self, value, model_instance):
         # coerce value back to a string to validate correctly
@@ -37,14 +36,8 @@ def get_prep_value(self, value):
             return smart_unicode(value)
         return value
 
-    def get_db_prep_save(self, value, connection=None):
-        """
-        Prepares the given value for insertion into the database.
-        """
-        return self.get_prep_value(value)
-
     def flatten_data(self, follow, obj=None):
         value = self._get_val_from_obj(obj)
         if value is None:
-            value = ""
+            value = ''
         return {self.attname: smart_unicode(value)}

timezone_field/tests.py

@@ -7,9 +7,14 @@
 from timezone_field.fields import TimeZoneField
 
 
+PST = 'America/Los_Angeles'
+EST = 'America/New_York'
+
+
 class TestModel(models.Model):
     timezone = TimeZoneField()
 
+
 class TestModelForm(forms.ModelForm):
     class Meta:
         model = TestModel
@@ -18,33 +23,33 @@ class Meta:
 class TimeZoneFieldTestCase(TestCase):
 
     def test_models_modelform_validation(self):
-        form = TestModelForm({"timezone": "America/Denver"})
+        form = TestModelForm({'timezone': PST})
         self.assertTrue(form.is_valid())
 
     def test_models_modelform_save(self):
-        form = TestModelForm({"timezone": "America/Denver"})
+        form = TestModelForm({'timezone': EST})
         self.assertTrue(form.is_valid())
         form.save()
 
     def test_models_string_value(self):
-        p = TestModel(timezone="America/Denver")
+        p = TestModel(timezone=PST)
         p.save()
         p = TestModel.objects.get(pk=p.pk)
-        self.assertEqual(p.timezone, pytz.timezone("America/Denver"))
+        self.assertEqual(p.timezone, pytz.timezone(PST))
 
     def test_models_string_value_lookup(self):
-        TestModel(timezone="America/Denver").save()
-        qs = TestModel.objects.filter(timezone="America/Denver")
+        TestModel(timezone=EST).save()
+        qs = TestModel.objects.filter(timezone=EST)
         self.assertEqual(qs.count(), 1)
 
     def test_models_tz_value(self):
-        tz = pytz.timezone("America/Denver")
+        tz = pytz.timezone(PST)
         p = TestModel(timezone=tz)
         p.save()
         p = TestModel.objects.get(pk=p.pk)
         self.assertEqual(p.timezone, tz)
 
     def test_models_tz_value_lookup(self):
-        TestModel(timezone="America/Denver").save()
-        qs = TestModel.objects.filter(timezone=pytz.timezone("America/Denver"))
+        TestModel(timezone=PST).save()
+        qs = TestModel.objects.filter(timezone=pytz.timezone(PST))
         self.assertEqual(qs.count(), 1)