Merge branch 'django14'

Conflicts:
	templates/releng/result_section.html

2 files changed, 4 insertions, 3 deletions

diff --git a/releng/management/commands/syncisos.py b/releng/management/commands/syncisos.py
index 270c6c3..62f005f 100644
--- a/releng/management/commands/syncisos.py
+++ b/releng/management/commands/syncisos.py
@@ -1,4 +1,3 @@
-from datetime import datetime
 import re
 import urllib
 from HTMLParser import HTMLParser, HTMLParseError
@@ -6,8 +5,10 @@ from HTMLParser import HTMLParser, HTMLParseError
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
 
+from main.utils import utc_now
 from releng.models import Iso
 
+
 class IsoListParser(HTMLParser):
     def __init__(self):
         HTMLParser.__init__(self)
@@ -53,7 +54,7 @@ class Command(BaseCommand):
                     existing.active = True
                     existing.removed = None
                     existing.save()
-        now = datetime.utcnow()
+        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)
diff --git a/releng/urls.py b/releng/urls.py
index 239ad02..8d1b8f2 100644
--- a/releng/urls.py
+++ b/releng/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import include, patterns
+from django.conf.urls import include, patterns
 
 feedback_patterns = patterns('releng.views',
     (r'^$',                              'test_results_overview', {}, 'releng-test-overview'),