Update usage of datetime.now to Django timezone aware now()

This commit is contained in:
Roberto Rosario
2014-06-29 17:00:07 -04:00
parent a46642015b
commit d640eacec8
16 changed files with 54 additions and 47 deletions
+2 -2
View File
@@ -1,9 +1,9 @@
from __future__ import absolute_import
from ast import literal_eval
import datetime
from django.db import models
from django.utils.timezone import now
from .conf.settings import RECENT_COUNT
@@ -35,7 +35,7 @@ class RecentDocumentManager(models.Manager):
new_recent, created = self.model.objects.get_or_create(user=user, document=document)
if not created:
# document already in the recent list, just update the accessed date and time
new_recent.datetime_accessed = datetime.datetime.now()
new_recent.datetime_accessed = now()
new_recent.save()
for recent_to_delete in self.model.objects.filter(user=user)[RECENT_COUNT:]:
recent_to_delete.delete()
+4 -3
View File
@@ -16,6 +16,7 @@ except ImportError:
from django.db import models
from django.contrib.auth.models import User
from django.core.exceptions import ValidationError
from django.utils.timezone import now
from django.utils.translation import ugettext
from django.utils.translation import ugettext_lazy as _
@@ -103,7 +104,7 @@ class Document(models.Model):
def save(self, *args, **kwargs):
if not self.pk:
self.uuid = UUID_FUNCTION()
self.date_added = datetime.datetime.now()
self.date_added = now()
super(Document, self).save(*args, **kwargs)
def get_cached_image_name(self, page, version):
@@ -368,7 +369,7 @@ class DocumentVersion(models.Model):
"""
new_document = not self.pk
if not self.pk:
self.timestamp = datetime.datetime.now()
self.timestamp = now()
# Only do this for new documents
transformations = kwargs.pop('transformations', None)
@@ -633,7 +634,7 @@ class RecentDocument(models.Model):
"""
user = models.ForeignKey(User, verbose_name=_(u'user'), editable=False)
document = models.ForeignKey(Document, verbose_name=_(u'document'), editable=False)
datetime_accessed = models.DateTimeField(verbose_name=_(u'accessed'), default=lambda: datetime.datetime.now(), db_index=True)
datetime_accessed = models.DateTimeField(verbose_name=_(u'accessed'), default=lambda: now(), db_index=True)
objects = RecentDocumentManager()