diff options
| author | Dan McGee <dan@archlinux.org> | 2012-03-24 02:19:34 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-03-24 02:19:34 +0100 |
| commit | 822898e57bc6d4e008ef58da309857e9ef8c98e6 (patch) | |
| tree | 1af0836c927b87e2249628d47cdfefe77c3b18fd /main/migrations/0054_auto__add_field_donor_created.py | |
| parent | ea87160c397fe1daf63851f0ed0be146bea79196 (diff) | |
| parent | 8e10699d53281be53c88a3695de6aa496e084dc6 (diff) | |
| download | archweb-822898e57bc6d4e008ef58da309857e9ef8c98e6.tar.gz archweb-822898e57bc6d4e008ef58da309857e9ef8c98e6.tar.xz | |
Merge branch 'django14'
Conflicts:
templates/releng/result_section.html
Diffstat (limited to 'main/migrations/0054_auto__add_field_donor_created.py')
| -rw-r--r-- | main/migrations/0054_auto__add_field_donor_created.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/migrations/0054_auto__add_field_donor_created.py b/main/migrations/0054_auto__add_field_donor_created.py index f4d5b15..c96c0f5 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): |