Remove custom utc_now() function, use django.utils.timezone.now()

This was around from the time when we handled timezones sanely and
Django did not; now that we are on 1.4 we no longer need our own code to
handle this.

Signed-off-by: Dan McGee <dan@archlinux.org>

2 files changed, 5 insertions, 9 deletions

diff --git a/main/models.py b/main/models.py
index 04d8da8f..6c9dfe4d 100644
--- a/main/models.py
+++ b/main/models.py
@@ -6,9 +6,10 @@ from pgpdump import BinaryData
 from django.db import models
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
+from django.utils.timezone import now
 
 from .fields import PositiveBigIntegerField
-from .utils import cache_function, set_created_field, utc_now
+from .utils import cache_function, set_created_field
 
 
 class TodolistManager(models.Manager):
@@ -385,7 +386,7 @@ class TodolistPkg(models.Model):
 def set_todolist_fields(sender, **kwargs):
     todolist = kwargs['instance']
     if not todolist.date_added:
-        todolist.date_added = utc_now()
+        todolist.date_added = now()
 
 # connect signals needed to keep cache in line with reality
 from main.utils import refresh_latest
diff --git a/main/utils.py b/main/utils.py
index 879abfb9..0b6849a4 100644
--- a/main/utils.py
+++ b/main/utils.py
@@ -5,10 +5,10 @@ except ImportError:
 
 from datetime import datetime
 import hashlib
-from pytz import utc
 
 from django.core.cache import cache
 from django.db import connections, router
+from django.utils.timezone import now
 
 
 CACHE_TIMEOUT = 1800
@@ -94,17 +94,12 @@ def retrieve_latest(sender, latest_by=None):
     return None
 
 
-def utc_now():
-    '''Returns a timezone-aware UTC date representing now.'''
-    return datetime.utcnow().replace(tzinfo=utc)
-
-
 def set_created_field(sender, **kwargs):
     '''This will set the 'created' field on any object to the current UTC time
     if it is unset. For use as a pre_save signal handler.'''
     obj = kwargs['instance']
     if hasattr(obj, 'created') and not obj.created:
-        obj.created = utc_now()
+        obj.created = now()
 
 
 def database_vendor(model, mode='read'):