Adds migrations to setup.py; Migrates to auto_now for TZ awareness

mailer/forms.py

@@ -47,4 +47,4 @@ def save(self, commit=True):
 
     class Meta:
         model = Message
-        fields = ('from_email', 'to', 'subject', 'body', 'body_html', 'when_added', 'priority')
+        fields = ('from_email', 'to', 'subject', 'body', 'body_html', 'priority')

mailer/migrations/0003_auto__chg_field_message_when_added__chg_field_messagelog_when_attempte.py

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'Message.when_added'
+        db.alter_column('mailer_message', 'when_added', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True))
+
+        # Changing field 'MessageLog.when_attempted'
+        db.alter_column('mailer_messagelog', 'when_attempted', self.gf('django.db.models.fields.DateTimeField')(auto_now=True))
+
+        # Changing field 'MessageLog.when_added'
+        db.alter_column('mailer_messagelog', 'when_added', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True))
+
+        # Changing field 'DontSendEntry.when_added'
+        db.alter_column('mailer_dontsendentry', 'when_added', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True))
+
+    def backwards(self, orm):
+
+        # Changing field 'Message.when_added'
+        db.alter_column('mailer_message', 'when_added', self.gf('django.db.models.fields.DateTimeField')())
+
+        # Changing field 'MessageLog.when_attempted'
+        db.alter_column('mailer_messagelog', 'when_attempted', self.gf('django.db.models.fields.DateTimeField')())
+
+        # Changing field 'MessageLog.when_added'
+        db.alter_column('mailer_messagelog', 'when_added', self.gf('django.db.models.fields.DateTimeField')())
+
+        # Changing field 'DontSendEntry.when_added'
+        db.alter_column('mailer_dontsendentry', 'when_added', self.gf('django.db.models.fields.DateTimeField')())
+
+    models = {
+        'mailer.dontsendentry': {
+            'Meta': {'object_name': 'DontSendEntry'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'to_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            'when_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'})
+        },
+        'mailer.message': {
+            'Meta': {'object_name': 'Message'},
+            'connection_kwargs_data': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'message_data': ('django.db.models.fields.TextField', [], {}),
+            'priority': ('django.db.models.fields.CharField', [], {'default': "'2'", 'max_length': '1'}),
+            'when_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'})
+        },
+        'mailer.messagelog': {
+            'Meta': {'object_name': 'MessageLog'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'log_message': ('django.db.models.fields.TextField', [], {}),
+            'message_data': ('django.db.models.fields.TextField', [], {}),
+            'priority': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'result': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'when_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'when_attempted': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['mailer']

mailer/models.py

@@ -93,7 +93,7 @@ class Message(models.Model):
 
     # The actual data - a pickled EmailMessage
     message_data = models.TextField()
-    when_added = models.DateTimeField(default=datetime.now)
+    when_added = models.DateTimeField(auto_now_add=True)
     priority = models.CharField(max_length=1, choices=PRIORITIES, default="2")
     connection_kwargs_data = models.TextField()
     # @@@ campaign?
@@ -232,7 +232,7 @@ def has_address(self, address):
 class DontSendEntry(models.Model):
 
     to_address = models.EmailField()
-    when_added = models.DateTimeField()
+    when_added = models.DateTimeField(auto_now_add=True)
     # @@@ who added?
     # @@@ comment field?
 
@@ -273,12 +273,12 @@ class MessageLog(models.Model):
 
     # fields from Message
     message_data = models.TextField()
-    when_added = models.DateTimeField()
+    when_added = models.DateTimeField(auto_now_add=True)
     priority = models.CharField(max_length=1, choices=PRIORITIES)
     # @@@ campaign?
 
     # additional logging fields
-    when_attempted = models.DateTimeField(default=datetime.now)
+    when_attempted = models.DateTimeField(auto_now=True)
     result = models.CharField(max_length=1, choices=RESULT_CODES)
     log_message = models.TextField()
 

setup.py

@@ -13,6 +13,7 @@
         "mailer",
         "mailer.management",
         "mailer.management.commands",
+        "mailer.migrations",
     ],
     package_dir={"mailer": "mailer"},
     classifiers=[