From 1663a03a337f90e6b8f19994938ae4d38655a062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Thu, 23 Feb 2017 18:33:44 +0100 Subject: [PATCH 1/2] Use timezones everywhere in migrations --- kfet/migrations/0001_initial.py | 4 ++-- kfet/migrations/0002_auto_20160802_2139.py | 9 +++++++-- kfet/migrations/0003_auto_20160802_2142.py | 4 ++-- kfet/migrations/0020_auto_20160808_0450.py | 7 +++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/kfet/migrations/0001_initial.py b/kfet/migrations/0001_initial.py index 84d81205..b4627c7b 100644 --- a/kfet/migrations/0001_initial.py +++ b/kfet/migrations/0001_initial.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals from django.db import models, migrations import django.db.models.deletion import django.core.validators -import datetime +from django.utils import timezone class Migration(migrations.Migration): @@ -31,7 +31,7 @@ class Migration(migrations.Migration): name='AccountNegative', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start', models.DateTimeField(default=datetime.datetime(2016, 8, 2, 10, 22, 1, 569492))), + ('start', models.DateTimeField(default=timezone.datetime(2016, 8, 2, 10, 22, 1, 569492, tzinfo=timezone.get_default_timezone()))), ('balance_offset', models.DecimalField(decimal_places=2, max_digits=6)), ('authorized_overdraft', models.DecimalField(decimal_places=2, default=0, max_digits=6)), ('comment', models.CharField(max_length=255, blank=True)), diff --git a/kfet/migrations/0002_auto_20160802_2139.py b/kfet/migrations/0002_auto_20160802_2139.py index 0a59de44..2eaa7ea3 100644 --- a/kfet/migrations/0002_auto_20160802_2139.py +++ b/kfet/migrations/0002_auto_20160802_2139.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import datetime +from django.utils import timezone class Migration(migrations.Migration): @@ -19,6 +19,11 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='accountnegative', name='start', - field=models.DateTimeField(default=datetime.datetime(2016, 8, 2, 21, 39, 30, 52279)), + field=models.DateTimeField( + default=timezone.datetime( + 2016, 8, 2, 21, 39, 30, 52279, + tzinfo=timezone.get_default_timezone() + ) + ), ), ] diff --git a/kfet/migrations/0003_auto_20160802_2142.py b/kfet/migrations/0003_auto_20160802_2142.py index 586146de..02333d3b 100644 --- a/kfet/migrations/0003_auto_20160802_2142.py +++ b/kfet/migrations/0003_auto_20160802_2142.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import datetime +from django.utils import timezone class Migration(migrations.Migration): @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='accountnegative', name='start', - field=models.DateTimeField(default=datetime.datetime.now), + field=models.DateTimeField(default=timezone.now), ), ] diff --git a/kfet/migrations/0020_auto_20160808_0450.py b/kfet/migrations/0020_auto_20160808_0450.py index 2ecc18ee..c5ab6209 100644 --- a/kfet/migrations/0020_auto_20160808_0450.py +++ b/kfet/migrations/0020_auto_20160808_0450.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import datetime +from django.utils import timezone class Migration(migrations.Migration): @@ -15,6 +15,9 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='accountnegative', name='start', - field=models.DateTimeField(default=datetime.datetime.now, blank=True, null=True), + field=models.DateTimeField( + default=timezone.now, + blank=True, null=True + ), ), ] From 80f1514d39bc19e94233804c62c6ed35dc94cf26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Thu, 23 Feb 2017 18:35:04 +0100 Subject: [PATCH 2/2] handle timezones in petits_cours_views --- cof/petits_cours_views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cof/petits_cours_views.py b/cof/petits_cours_views.py index 8aae6b46..332ec831 100644 --- a/cof/petits_cours_views.py +++ b/cof/petits_cours_views.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import json -from datetime import datetime from custommail.shortcuts import render_custom_mail from django.shortcuts import render, get_object_or_404, redirect @@ -12,6 +11,7 @@ from django.views.decorators.csrf import csrf_exempt from django.conf import settings from django.contrib.auth.decorators import login_required from django.contrib import messages +from django.utils import timezone from .models import CofProfile from .petits_cours_models import ( @@ -279,7 +279,7 @@ def _traitement_post(request, demande): unlock_tables() demande.traitee = True demande.traitee_par = request.user - demande.processed = datetime.now() + demande.processed = timezone.now() demande.save() return render(request, "cof/traitement_demande_petit_cours_success.html",