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>

12 files changed, 49 insertions, 51 deletions

diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py
index 2d9b68b..e69691d 100644
--- a/devel/management/commands/reporead.py
+++ b/devel/management/commands/reporead.py
@@ -28,10 +28,11 @@ from pytz import utc
 from django.core.management.base import BaseCommand, CommandError
 from django.db import connections, router, transaction
 from django.db.utils import IntegrityError
+from django.utils.timezone import now
 
 from devel.utils import UserFinder
 from main.models import Arch, Package, PackageFile, Repo
-from main.utils import utc_now, database_vendor
+from main.utils import database_vendor
 from packages.models import Depend, Conflict, Provision, Replacement, Update
 
 
@@ -318,7 +319,7 @@ def populate_files(dbpkg, repopkg, force=False):
                     filename=filename)
             pkg_files.append(pkgfile)
         batched_bulk_create(PackageFile, pkg_files)
-        dbpkg.files_last_update = utc_now()
+        dbpkg.files_last_update = now()
         dbpkg.save()
 
 
@@ -388,7 +389,7 @@ def db_update(archname, reponame, pkgs, force=False):
         dbpkg = Package(pkgname=pkg.name, arch=architecture, repo=repository)
         try:
             with transaction.commit_on_success():
-                populate_pkg(dbpkg, pkg, timestamp=utc_now())
+                populate_pkg(dbpkg, pkg, timestamp=now())
                 Update.objects.log_update(None, dbpkg)
         except IntegrityError:
             logger.warning("Could not add package %s; "
@@ -417,7 +418,7 @@ def db_update(archname, reponame, pkgs, force=False):
         if not force and pkg_same_version(pkg, dbpkg):
             continue
         elif not force:
-            timestamp = utc_now()
+            timestamp = now()
 
         # The odd select_for_update song and dance here are to ensure
         # simultaneous updates don't happen on a package, causing
diff --git a/devel/models.py b/devel/models.py
index fd5df00..9b6f07a 100644
--- a/devel/models.py
+++ b/devel/models.py
@@ -4,10 +4,11 @@ import pytz
 from django.db import models
 from django.db.models.signals import pre_save
 from django.contrib.auth.models import User
+from django.utils.timezone import now
 from django_countries import CountryField
 
 from .fields import PGPKeyField
-from main.utils import make_choice, utc_now
+from main.utils import make_choice
 
 
 class UserProfile(models.Model):
@@ -105,7 +106,7 @@ def set_last_modified(sender, **kwargs):
     signal handler.'''
     obj = kwargs['instance']
     if hasattr(obj, 'last_modified'):
-        obj.last_modified = utc_now()
+        obj.last_modified = now()
 
 
 # connect signals needed to keep cache in line with reality
diff --git a/devel/views.py b/devel/views.py
index 78ed26f..143b12b 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -24,11 +24,11 @@ from django.views.decorators.cache import never_cache
 from django.views.generic.simple import direct_to_template
 from django.utils.encoding import force_unicode
 from django.utils.http import http_date
+from django.utils.timezone import now
 
 from .models import UserProfile
 from main.models import Package, PackageFile, TodolistPkg
 from main.models import Arch, Repo
-from main.utils import utc_now
 from news.models import News
 from packages.models import PackageRelation, Signoff, Depend
 from packages.utils import get_signoff_groups
@@ -122,15 +122,15 @@ def clock(request):
         else:
             dev.last_action = None
 
-    now = utc_now()
+    current_time = now()
     page_dict = {
             'developers': devs,
-            'utc_now': now,
+            'utc_now': current_time,
     }
 
     response = direct_to_template(request, 'devel/clock.html', page_dict)
     if not response.has_header('Expires'):
-        expire_time = now.replace(second=0, microsecond=0)
+        expire_time = current_time.replace(second=0, microsecond=0)
         expire_time += timedelta(minutes=1)
         expire_time = time.mktime(expire_time.timetuple())
         response['Expires'] = http_date(expire_time)
@@ -198,12 +198,12 @@ def report(request, report_name, username=None):
 
     if report_name == 'old':
         title = 'Packages last built more than one year ago'
-        cutoff = utc_now() - timedelta(days=365)
+        cutoff = now() - timedelta(days=365)
         packages = packages.filter(
                 build_date__lt=cutoff).order_by('build_date')
     elif report_name == 'long-out-of-date':
         title = 'Packages marked out-of-date more than 90 days ago'
-        cutoff = utc_now() - timedelta(days=90)
+        cutoff = now() - timedelta(days=90)
         packages = packages.filter(
                 flag_date__lt=cutoff).order_by('flag_date')
     elif report_name == 'big':
diff --git a/main/models.py b/main/models.py
index 04d8da8..6c9dfe4 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 879abfb..0b6849a 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'):
diff --git a/mirrors/management/commands/mirrorcheck.py b/mirrors/management/commands/mirrorcheck.py
index 7a133cb..e09ea68 100644
--- a/mirrors/management/commands/mirrorcheck.py
+++ b/mirrors/management/commands/mirrorcheck.py
@@ -29,8 +29,9 @@ import urllib2
 
 from django.core.management.base import NoArgsCommand
 from django.db import transaction
+from django.utils.timezone import now
 
-from main.utils import utc_now, database_vendor
+from main.utils import database_vendor
 from mirrors.models import MirrorUrl, MirrorLog
 
 logging.basicConfig(
@@ -83,7 +84,7 @@ def parse_lastsync(log, data):
 def check_mirror_url(mirror_url, timeout):
     url = mirror_url.url + 'lastsync'
     logger.info("checking URL %s", url)
-    log = MirrorLog(url=mirror_url, check_time=utc_now())
+    log = MirrorLog(url=mirror_url, check_time=now())
     headers = {'User-Agent': 'archweb/1.0'}
     req = urllib2.Request(url, None, headers)
     try:
@@ -136,7 +137,7 @@ def check_mirror_url(mirror_url, timeout):
 def check_rsync_url(mirror_url, timeout):
     url = mirror_url.url + 'lastsync'
     logger.info("checking URL %s", url)
-    log = MirrorLog(url=mirror_url, check_time=utc_now())
+    log = MirrorLog(url=mirror_url, check_time=now())
 
     tempdir = tempfile.mkdtemp()
     lastsync_path = os.path.join(tempdir, 'lastsync')
diff --git a/mirrors/utils.py b/mirrors/utils.py
index f2c98ee..bf030d3 100644
--- a/mirrors/utils.py
+++ b/mirrors/utils.py
@@ -1,13 +1,14 @@
 from datetime import timedelta
 
 from django.db.models import Avg, Count, Max, Min, StdDev
+from django.utils.timezone import now
 from django_countries.fields import Country
 
-from main.utils import cache_function, utc_now, database_vendor
+from main.utils import cache_function, database_vendor
 from .models import MirrorLog, MirrorProtocol, MirrorUrl
 
 
-default_cutoff = timedelta(hours=24)
+DEFAULT_CUTOFF = timedelta(hours=24)
 
 def annotate_url(url, delays):
     '''Given a MirrorURL object, add a few more attributes to it regarding
@@ -30,8 +31,8 @@ def annotate_url(url, delays):
 
 
 @cache_function(123)
-def get_mirror_statuses(cutoff=default_cutoff):
-    cutoff_time = utc_now() - cutoff
+def get_mirror_statuses(cutoff=DEFAULT_CUTOFF):
+    cutoff_time = now() - cutoff
     # I swear, this actually has decent performance...
     urls = MirrorUrl.objects.select_related('mirror', 'protocol').filter(
             mirror__active=True, mirror__public=True,
@@ -88,8 +89,8 @@ def get_mirror_statuses(cutoff=default_cutoff):
 
 
 @cache_function(117)
-def get_mirror_errors(cutoff=default_cutoff):
-    cutoff_time = utc_now() - cutoff
+def get_mirror_errors(cutoff=DEFAULT_CUTOFF):
+    cutoff_time = now() - cutoff
     errors = MirrorLog.objects.filter(
             is_success=False, check_time__gte=cutoff_time,
             url__mirror__active=True, url__mirror__public=True).values(
@@ -105,11 +106,11 @@ def get_mirror_errors(cutoff=default_cutoff):
 
 
 @cache_function(295)
-def get_mirror_url_for_download(cutoff=default_cutoff):
+def get_mirror_url_for_download(cutoff=DEFAULT_CUTOFF):
     '''Find a good mirror URL to use for package downloads. If we have mirror
     status data available, it is used to determine a good choice by looking at
     the last batch of status rows.'''
-    cutoff_time = utc_now() - cutoff
+    cutoff_time = now() - cutoff
     status_data = MirrorLog.objects.filter(
             check_time__gte=cutoff_time).aggregate(
             Max('check_time'), Max('last_sync'))
diff --git a/news/models.py b/news/models.py
index 95026e1..2efea57 100644
--- a/news/models.py
+++ b/news/models.py
@@ -1,8 +1,7 @@
 from django.db import models
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
-
-from main.utils import utc_now
+from django.utils.timezone import now
 
 
 class News(models.Model):
@@ -29,13 +28,13 @@ class News(models.Model):
 
 def set_news_fields(sender, **kwargs):
     news = kwargs['instance']
-    now = utc_now()
-    news.last_modified = now
+    current_time = now()
+    news.last_modified = current_time
     if not news.postdate:
-        news.postdate = now
+        news.postdate = current_time
         # http://diveintomark.org/archives/2004/05/28/howto-atom-id
         news.guid = 'tag:%s,%s:%s' % (Site.objects.get_current(),
-                now.strftime('%Y-%m-%d'), news.get_absolute_url())
+                current_time.strftime('%Y-%m-%d'), news.get_absolute_url())
 
 # connect signals needed to keep cache in line with reality
 from main.utils import refresh_latest
diff --git a/packages/management/commands/signoff_report.py b/packages/management/commands/signoff_report.py
index ddf930d..72fcbe1 100644
--- a/packages/management/commands/signoff_report.py
+++ b/packages/management/commands/signoff_report.py
@@ -15,6 +15,7 @@ from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
 from django.db.models import Count
 from django.template import loader, Context
+from django.utils.timezone import now
 
 from collections import namedtuple
 from datetime import timedelta
@@ -23,7 +24,6 @@ from operator import attrgetter
 import sys
 
 from main.models import Repo
-from main.utils import utc_now
 from packages.models import Signoff
 from packages.utils import get_signoff_groups
 
@@ -66,9 +66,9 @@ def generate_report(email, repo_name):
 
     new_hours = 24
     old_days = 14
-    now = utc_now()
-    new_cutoff = now - timedelta(hours=new_hours)
-    old_cutoff = now - timedelta(days=old_days)
+    current_time = now()
+    new_cutoff = current_time - timedelta(hours=new_hours)
+    old_cutoff = current_time - timedelta(days=old_days)
 
     if len(signoff_groups) == 0:
         # no need to send an email at all
diff --git a/packages/views/flag.py b/packages/views/flag.py
index 7fa2d50..f3db93b 100644
--- a/packages/views/flag.py
+++ b/packages/views/flag.py
@@ -5,12 +5,12 @@ from django.core.mail import send_mail
 from django.db import transaction
 from django.shortcuts import get_object_or_404, redirect
 from django.template import loader, Context
+from django.utils.timezone import now
 from django.views.generic.simple import direct_to_template
 from django.views.decorators.cache import cache_page, never_cache
 
 from ..models import FlagRequest
 from main.models import Package
-from main.utils import utc_now
 
 
 class FlagForm(forms.Form):
@@ -76,10 +76,10 @@ def flag(request, name, repo, arch):
 
             @transaction.commit_on_success
             def perform_updates():
-                now = utc_now()
-                pkgs.update(flag_date=now)
+                current_time = now()
+                pkgs.update(flag_date=current_time)
                 # store our flag request
-                flag_request = FlagRequest(created=now,
+                flag_request = FlagRequest(created=current_time,
                         user_email=email, message=message,
                         ip_address=ip_addr, pkgbase=pkg.pkgbase,
                         version=version, repo=pkg.repo,
diff --git a/packages/views/signoff.py b/packages/views/signoff.py
index 61d949f..7aa3910 100644
--- a/packages/views/signoff.py
+++ b/packages/views/signoff.py
@@ -8,11 +8,11 @@ from django.core.serializers.json import DjangoJSONEncoder
 from django.db import transaction
 from django.http import HttpResponse, Http404
 from django.shortcuts import get_list_or_404, redirect, render
+from django.utils.timezone import now
 from django.views.decorators.cache import never_cache
 from django.views.generic.simple import direct_to_template
 
 from main.models import Package, Arch, Repo
-from main.utils import utc_now
 from ..models import SignoffSpecification, Signoff
 from ..utils import (get_signoff_groups, approved_by_signoffs,
         PackageSignoffGroup)
@@ -45,7 +45,7 @@ def signoff_package(request, name, repo, arch, revoke=False):
                     package, request.user, False)
         except Signoff.DoesNotExist:
             raise Http404
-        signoff.revoked = utc_now()
+        signoff.revoked = now()
         signoff.save()
         created = False
     else:
diff --git a/releng/management/commands/syncisos.py b/releng/management/commands/syncisos.py
index 62f005f..223c771 100644
--- a/releng/management/commands/syncisos.py
+++ b/releng/management/commands/syncisos.py
@@ -4,8 +4,8 @@ from HTMLParser import HTMLParser, HTMLParseError
 
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
+from django.utils.timezone import now
 
-from main.utils import utc_now
 from releng.models import Iso
 
 
@@ -54,9 +54,8 @@ class Command(BaseCommand):
                     existing.active = True
                     existing.removed = None
                     existing.save()
-        now = utc_now()
         # and then mark all other names as no longer active
         Iso.objects.filter(active=True).exclude(name__in=active_isos).update(
-                active=False, removed=now)
+                active=False, removed=now())
 
 # vim: set ts=4 sw=4 et: