# HG changeset patch # User Peter Sanchez # Date 1357091612 28800 # Tue Jan 01 17:53:32 2013 -0800 # Node ID 131530a653fde381b3c194578b6a6f99acc1c7a4 # Parent 0ef3decac4909be957d93f3a34963bc1fc0bda13 Small version bump. Django 1.4+ support for timezones diff --git a/callback/__init__.py b/callback/__init__.py --- a/callback/__init__.py +++ b/callback/__init__.py @@ -3,7 +3,7 @@ from callback.signals import stored_callback, processed_callback, error_callback -__version__ = '0.5' +__version__ = '0.6' __all__ = [ 'CallbackException', 'CallbackBase', 'callback_manager', 'stored_callback', 'processed_callback', 'error_callback', diff --git a/callback/managers.py b/callback/managers.py --- a/callback/managers.py +++ b/callback/managers.py @@ -2,6 +2,7 @@ import hashlib import datetime from django.db import models +from django.utils import timezone from django.contrib.auth.models import User Q = models.Q @@ -24,7 +25,7 @@ return self.get_query_set().filter(query) def all_expired_callbacks(self, days=7, delete_errors=False): - use_date = datetime.date.today() - datetime.timedelta(days=days) + use_date = timezone.now().date() - datetime.timedelta(days=days) query = Q(is_active=False) if not delete_errors: query &= Q(is_error=False) diff --git a/callback/models.py b/callback/models.py --- a/callback/models.py +++ b/callback/models.py @@ -1,5 +1,5 @@ -import datetime from django.db import models +from django.utils import timezone from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes import generic from callback.managers import CallbackMapManager @@ -16,8 +16,8 @@ is_error = models.BooleanField(default=False) error_msg = models.TextField(blank=True) - created_on = models.DateTimeField(default=datetime.datetime.now) - updated_on = models.DateTimeField(default=datetime.datetime.now) + created_on = models.DateTimeField(default=timezone.now) + updated_on = models.DateTimeField(default=timezone.now) objects = CallbackMapManager() @@ -43,5 +43,5 @@ def save(self, *args, **kwargs): if self.id: - self.updated_on = datetime.datetime.now() + self.updated_on = timezone.now() super(CallbackMap, self).save(*args, **kwargs)