Merge branch 'django14'

Conflicts:
	templates/releng/result_section.html

2 files changed, 4 insertions, 5 deletions

diff --git a/packages/views/flag.py b/packages/views/flag.py
index c0990e8e..0d2f9009 100644
--- a/packages/views/flag.py
+++ b/packages/views/flag.py
@@ -1,5 +1,3 @@
-from datetime import datetime
-
 from django import forms
 from django.conf import settings
 from django.contrib.auth.decorators import permission_required
@@ -12,6 +10,7 @@ from django.views.decorators.cache import never_cache
 
 from ..models import FlagRequest
 from main.models import Package
+from main.utils import utc_now
 
 
 def flaghelp(request):
@@ -61,7 +60,7 @@ def flag(request, name, repo, arch):
 
             @transaction.commit_on_success
             def perform_updates():
-                now = datetime.utcnow()
+                now = utc_now()
                 pkgs.update(flag_date=now)
                 # store our flag request
                 flag_request = FlagRequest(created=now,
diff --git a/packages/views/signoff.py b/packages/views/signoff.py
index e3daf0dd..cf00b0b9 100644
--- a/packages/views/signoff.py
+++ b/packages/views/signoff.py
@@ -1,4 +1,3 @@
-from datetime import datetime
 from operator import attrgetter
 
 from django import forms
@@ -13,6 +12,7 @@ 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 = datetime.utcnow()
+        signoff.revoked = utc_now()
         signoff.save()
         created = False
     else: