diff --git a/django_mailer/__init__.py b/django_mailer/__init__.py index be0b1c22..b353de41 100644 --- a/django_mailer/__init__.py +++ b/django_mailer/__init__.py @@ -1,6 +1,6 @@ import logging -VERSION = (1, 2, 0) +VERSION = (1, 2, 2) logger = logging.getLogger('django_mailer') logger.setLevel(logging.DEBUG) diff --git a/django_mailer/models.py b/django_mailer/models.py index b50897db..8ea12851 100644 --- a/django_mailer/models.py +++ b/django_mailer/models.py @@ -1,6 +1,10 @@ from django.db import models from django_mailer import constants, managers -import datetime +try: + from django.utils.timezone import now as default_now +except ImportError: + # Django < 1.4 comes without timezone support + from datetime.datetime import now as default_now PRIORITIES = ( @@ -31,7 +35,7 @@ class Message(models.Model): subject = models.CharField(max_length=255) encoded_message = models.TextField() - date_created = models.DateTimeField(default=datetime.datetime.now) + date_created = models.DateTimeField(default=default_now) class Meta: ordering = ('date_created',) @@ -53,7 +57,7 @@ class QueuedMessage(models.Model): default=constants.PRIORITY_NORMAL) deferred = models.DateTimeField(null=True, blank=True) retries = models.PositiveIntegerField(default=0) - date_queued = models.DateTimeField(default=datetime.datetime.now) + date_queued = models.DateTimeField(default=default_now) objects = managers.QueueManager() @@ -61,7 +65,7 @@ class Meta: ordering = ('priority', 'date_queued') def defer(self): - self.deferred = datetime.datetime.now() + self.deferred = default_now() self.save() @@ -74,7 +78,7 @@ class Blacklist(models.Model): """ email = models.EmailField(max_length=200) - date_added = models.DateTimeField(default=datetime.datetime.now) + date_added = models.DateTimeField(default=default_now) class Meta: ordering = ('-date_added',) @@ -89,7 +93,7 @@ class Log(models.Model): """ message = models.ForeignKey(Message, editable=False) result = models.PositiveSmallIntegerField(choices=RESULT_CODES) - date = models.DateTimeField(default=datetime.datetime.now) + date = models.DateTimeField(default=default_now) log_message = models.TextField() class Meta: