Merge branch 'django14'

Conflicts:
	templates/releng/result_section.html

6 files changed, 13 insertions, 10 deletions

diff --git a/packages/management/commands/signoff_report.py b/packages/management/commands/signoff_report.py
index 3b67f518..ddf930db 100644
--- a/packages/management/commands/signoff_report.py
+++ b/packages/management/commands/signoff_report.py
@@ -17,12 +17,13 @@ from django.db.models import Count
 from django.template import loader, Context
 
 from collections import namedtuple
-from datetime  import datetime, timedelta
+from datetime import timedelta
 import logging
 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
 
@@ -65,7 +66,7 @@ def generate_report(email, repo_name):
 
     new_hours = 24
     old_days = 14
-    now = datetime.utcnow()
+    now = utc_now()
     new_cutoff = now - timedelta(hours=new_hours)
     old_cutoff = now - timedelta(days=old_days)
 
diff --git a/packages/migrations/0007_auto__add_field_packagerelation_created.py b/packages/migrations/0007_auto__add_field_packagerelation_created.py
index 37321fdb..b030909e 100644
--- a/packages/migrations/0007_auto__add_field_packagerelation_created.py
+++ b/packages/migrations/0007_auto__add_field_packagerelation_created.py
@@ -1,5 +1,6 @@
 # encoding: utf-8
 import datetime
+from pytz import utc
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
@@ -7,7 +8,9 @@ from django.db import models
 class Migration(SchemaMigration):
 
     def forwards(self, orm):
-        db.add_column('packages_packagerelation', 'created', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.utcnow()), keep_default=False)
+        old_date = datetime.datetime(2000, 1, 1)
+        old_date = old_date.replace(tzinfo=utc)
+        db.add_column('packages_packagerelation', 'created', self.gf('django.db.models.fields.DateTimeField')(default=old_date), keep_default=False)
 
     def backwards(self, orm):
         db.delete_column('packages_packagerelation', 'created')
diff --git a/packages/urls.py b/packages/urls.py
index 52b09d2c..7e12a239 100644
--- a/packages/urls.py
+++ b/packages/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import include, patterns
+from django.conf.urls import include, patterns
 
 package_patterns = patterns('packages.views',
     (r'^$',            'details'),
diff --git a/packages/urls_groups.py b/packages/urls_groups.py
index d609944b..49ced145 100644
--- a/packages/urls_groups.py
+++ b/packages/urls_groups.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 
 urlpatterns = patterns('packages.views',
     (r'^$',                     'groups', {}, 'groups-list'),
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: