Merge branch 'django14'

Conflicts:
	templates/releng/result_section.html

4 files changed, 30 insertions, 9 deletions

diff --git a/main/migrations/0050_auto__chg_field_package_compressed_size__chg_field_package_installed_s.py b/main/migrations/0050_auto__chg_field_package_compressed_size__chg_field_package_installed_s.py
index 7aa09596..8368ae2e 100644
--- a/main/migrations/0050_auto__chg_field_package_compressed_size__chg_field_package_installed_s.py
+++ b/main/migrations/0050_auto__chg_field_package_compressed_size__chg_field_package_installed_s.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
@@ -9,7 +10,9 @@ class Migration(SchemaMigration):
     def forwards(self, orm):
         db.alter_column('packages', 'compressed_size', self.gf('main.models.PositiveBigIntegerField')(default=0))
         db.alter_column('packages', 'installed_size', self.gf('main.models.PositiveBigIntegerField')(default=0))
-        db.alter_column('packages', 'last_update', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime(2000, 1, 1)))
+        old_date = datetime.datetime(2000, 1, 1)
+        old_date = old_date.replace(tzinfo=utc)
+        db.alter_column('packages', 'last_update', self.gf('django.db.models.fields.DateTimeField')(default=old_date))
 
     def backwards(self, orm):
         db.alter_column('packages', 'compressed_size', self.gf('django.db.models.fields.BigIntegerField')(null=True))
diff --git a/main/migrations/0054_auto__add_field_donor_created.py b/main/migrations/0054_auto__add_field_donor_created.py
index f4d5b157..c96c0f5d 100644
--- a/main/migrations/0054_auto__add_field_donor_created.py
+++ b/main/migrations/0054_auto__add_field_donor_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
@@ -8,7 +9,9 @@ class Migration(SchemaMigration):
 
     def forwards(self, orm):
         # Adding field 'Donor.created'
-        db.add_column('donors', 'created', self.gf('django.db.models.fields.DateTimeField')(default=datetime.date(2000, 1, 1)), keep_default=False)
+        old_date = datetime.datetime(2000, 1, 1)
+        old_date = old_date.replace(tzinfo=utc)
+        db.add_column('donors', 'created', self.gf('django.db.models.fields.DateTimeField')(default=old_date), keep_default=False)
 
 
     def backwards(self, orm):
diff --git a/main/models.py b/main/models.py
index 4f2d64ea..7d017242 100644
--- a/main/models.py
+++ b/main/models.py
@@ -9,7 +9,7 @@ from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
 
 from .fields import PositiveBigIntegerField, PGPKeyField
-from .utils import cache_function, make_choice, set_created_field
+from .utils import cache_function, make_choice, set_created_field, utc_now
 
 
 class UserProfile(models.Model):
@@ -515,7 +515,7 @@ class TodolistPkg(models.Model):
 def set_todolist_fields(sender, **kwargs):
     todolist = kwargs['instance']
     if not todolist.date_added:
-        todolist.date_added = datetime.utcnow()
+        todolist.date_added = utc_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 81f689e7..e7e47c53 100644
--- a/main/utils.py
+++ b/main/utils.py
@@ -4,20 +4,24 @@ except ImportError:
     import pickle
 
 from datetime import datetime
+import hashlib
+from pytz import utc
 
 from django.core.cache import cache
-from django.utils.hashcompat import md5_constructor
+
 
 CACHE_TIMEOUT = 1800
 INVALIDATE_TIMEOUT = 10
 CACHE_LATEST_PREFIX = 'cache_latest_'
 
+
 def cache_function_key(func, args, kwargs):
     raw = [func.__name__, func.__module__, args, kwargs]
     pickled = pickle.dumps(raw, protocol=pickle.HIGHEST_PROTOCOL)
-    key = md5_constructor(pickled).hexdigest()
+    key = hashlib.md5(pickled).hexdigest()
     return 'cache_function.' + func.__name__ + '.' + key
 
+
 def cache_function(length):
     """
     A variant of the snippet posted by Jeff Wheeler at
@@ -43,6 +47,7 @@ def cache_function(length):
         return inner_func
     return decorator
 
+
 def clear_cache_function(func, args, kwargs):
     key = cache_function_key(func, args, kwargs)
     cache.delete(key)
@@ -50,6 +55,7 @@ def clear_cache_function(func, args, kwargs):
 # utility to make a pair of django choices
 make_choice = lambda l: [(str(m), str(m)) for m in l]
 
+
 # These are in here because we would be jumping around in some import circles
 # and hoops otherwise. The only thing currently using these keys is the feed
 # caching stuff.
@@ -65,6 +71,7 @@ def refresh_latest(**kwargs):
     # will be valid again. See "Scaling Django" by Mike Malone, slide 30.
     cache.set(cache_key, None, INVALIDATE_TIMEOUT)
 
+
 def retrieve_latest(sender):
     # we could break this down based on the request url, but it would probably
     # cost us more in query time to do so.
@@ -84,12 +91,19 @@ def retrieve_latest(sender):
         pass
     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 datetime.utcnow() if
-    it is unset. For use as a pre_save signal handler.'''
+    '''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 = datetime.utcnow()
+        obj.created = utc_now()
+
 
 def groupby_preserve_order(iterable, keyfunc):
     '''Take an iterable and regroup using keyfunc to determine whether items
@@ -112,6 +126,7 @@ def groupby_preserve_order(iterable, keyfunc):
 
     return result
 
+
 class PackageStandin(object):
     '''Resembles a Package object, and has a few of the same fields, but is
     really a link to a pkgbase that has no package with matching pkgname.'''