From 3a7b9520908cc926b9ccb2a7f09bf4039c5c6979 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Mon, 30 Jan 2017 12:16:07 +0100 Subject: [PATCH] first pass with 2to3 --- src/camps/migrations/0001_initial.py | 2 +- .../migrations/0002_auto_20160117_1718.py | 2 +- .../migrations/0003_auto_20160422_2019.py | 2 +- .../migrations/0004_camp_ticket_sale_open.py | 2 +- .../migrations/0005_auto_20160510_2011.py | 2 +- .../migrations/0006_auto_20160804_1705.py | 2 +- .../migrations/0007_auto_20161212_1803.py | 2 +- src/camps/migrations/0008_delete_day.py | 2 +- .../migrations/0009_auto_20161220_1645.py | 2 +- .../migrations/0010_auto_20161220_1714.py | 2 +- .../migrations/0011_auto_20161228_1750.py | 2 +- .../migrations/0012_auto_20161228_2312.py | 2 +- .../migrations/0013_auto_20161229_2201.py | 2 +- .../migrations/0014_auto_20161229_2202.py | 2 +- .../migrations/0015_auto_20170116_1634.py | 2 +- src/camps/migrations/0016_camp_description.py | 2 +- .../0017_remove_camp_description.py | 2 +- .../migrations/0018_auto_20170128_1841.py | 2 +- src/camps/models.py | 2 +- src/info/apps.py | 2 +- src/info/migrations/0001_initial.py | 2 +- .../migrations/0002_auto_20161228_2312.py | 2 +- src/info/models.py | 2 +- src/ircbot/apps.py | 2 +- src/ircbot/irc3module.py | 16 +-- src/ircbot/migrations/0001_initial.py | 2 +- src/ircbot/models.py | 2 +- src/news/apps.py | 2 +- src/news/migrations/0001_initial.py | 2 +- .../migrations/0002_auto_20160530_2223.py | 2 +- src/news/migrations/0003_newsitem_slug.py | 2 +- .../migrations/0004_auto_20160610_1743.py | 2 +- .../migrations/0005_auto_20160618_1902.py | 2 +- .../migrations/0006_remove_newsitem_public.py | 2 +- .../migrations/0007_auto_20161220_1136.py | 2 +- src/news/migrations/0008_newsitem_archived.py | 2 +- src/news/models.py | 2 +- src/profiles/migrations/0001_initial.py | 2 +- src/program/migrations/0001_initial.py | 2 +- .../migrations/0002_eventtype_color.py | 2 +- .../0003_eventtype_light_writing.py | 2 +- .../migrations/0004_auto_20160804_1712.py | 2 +- .../migrations/0005_auto_20160807_1312.py | 2 +- .../migrations/0006_auto_20160807_1320.py | 2 +- .../migrations/0007_auto_20160807_1333.py | 2 +- .../migrations/0008_auto_20160808_1747.py | 2 +- .../migrations/0009_auto_20160827_0752.py | 2 +- .../migrations/0010_auto_20161212_1809.py | 2 +- .../migrations/0011_auto_20161229_2149.py | 2 +- .../migrations/0012_auto_20161229_2150.py | 2 +- .../migrations/0013_auto_20170121_1312.py | 2 +- src/program/migrations/0014_speaker_camp.py | 2 +- .../migrations/0015_auto_20170128_1841.py | 2 +- src/program/models.py | 2 +- src/shop/email.py | 4 +- src/shop/epay.py | 2 +- src/shop/epayintegration.py | 16 +-- src/shop/migrations/0001_initial.py | 2 +- .../0002_orderproductrelation_handed_out.py | 2 +- .../migrations/0003_auto_20160513_0646.py | 2 +- .../migrations/0004_auto_20160515_1604.py | 2 +- src/shop/migrations/0005_product_slug.py | 2 +- src/shop/migrations/0006_ensure_slugs.py | 2 +- .../migrations/0007_auto_20160515_2157.py | 2 +- .../migrations/0008_auto_20160516_0954.py | 2 +- .../migrations/0009_epaycallback_md5valid.py | 2 +- .../migrations/0010_auto_20160517_1313.py | 2 +- .../migrations/0011_auto_20160517_1902.py | 2 +- src/shop/migrations/0012_ticket.py | 2 +- .../migrations/0013_ticket_qrcode_base64.py | 2 +- src/shop/migrations/0014_ticket_name.py | 2 +- .../0015_coinifyapiinvoice_coinifycallback.py | 2 +- .../migrations/0016_auto_20160529_1122.py | 2 +- .../migrations/0017_auto_20160529_1626.py | 2 +- .../migrations/0018_auto_20160529_1736.py | 2 +- .../migrations/0019_invoice_pdf_generated.py | 2 +- .../migrations/0020_auto_20160530_1824.py | 2 +- src/shop/migrations/0021_ticket_email.py | 2 +- .../migrations/0022_auto_20160530_2301.py | 2 +- src/shop/migrations/0023_order_cancelled.py | 2 +- .../migrations/0024_auto_20160605_2126.py | 2 +- src/shop/migrations/0025_creditnote.py | 2 +- src/shop/migrations/0026_order_refunded.py | 2 +- .../migrations/0027_auto_20160712_2036.py | 2 +- .../migrations/0028_auto_20160712_2119.py | 2 +- .../migrations/0029_auto_20160712_2133.py | 2 +- .../migrations/0030_auto_20160827_0752.py | 2 +- .../migrations/0031_auto_20161109_1000.py | 2 +- .../migrations/0032_order_customer_comment.py | 2 +- .../migrations/0033_auto_20161212_1756.py | 2 +- src/shop/pdf.py | 100 +++++++++--------- src/shop/views.py | 12 +-- src/sponsors/apps.py | 2 +- src/utils/apps.py | 2 +- .../management/commands/bootstrap-devsite.py | 18 ++-- src/villages/apps.py | 2 +- src/villages/migrations/0001_initial.py | 2 +- .../migrations/0002_auto_20160705_2154.py | 2 +- .../migrations/0003_auto_20160705_2159.py | 2 +- .../migrations/0004_village_deleted.py | 2 +- .../migrations/0005_auto_20160712_2036.py | 2 +- .../migrations/0006_remove_village_camp.py | 2 +- src/villages/migrations/0007_village_camp.py | 2 +- .../migrations/0008_auto_20161228_2209.py | 2 +- .../migrations/0009_auto_20161229_2143.py | 2 +- src/villages/models.py | 2 +- src/villages/urls.py | 2 +- 107 files changed, 184 insertions(+), 184 deletions(-) diff --git a/src/camps/migrations/0001_initial.py b/src/camps/migrations/0001_initial.py index b0fa0fa8..167f4b26 100644 --- a/src/camps/migrations/0001_initial.py +++ b/src/camps/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import models, migrations import uuid diff --git a/src/camps/migrations/0002_auto_20160117_1718.py b/src/camps/migrations/0002_auto_20160117_1718.py index 5f8eb965..7e5a4a63 100644 --- a/src/camps/migrations/0002_auto_20160117_1718.py +++ b/src/camps/migrations/0002_auto_20160117_1718.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.1 on 2016-01-17 17:18 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/src/camps/migrations/0003_auto_20160422_2019.py b/src/camps/migrations/0003_auto_20160422_2019.py index 108b78ba..391b3097 100644 --- a/src/camps/migrations/0003_auto_20160422_2019.py +++ b/src/camps/migrations/0003_auto_20160422_2019.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.2 on 2016-04-22 20:19 -from __future__ import unicode_literals + from django.db import migrations diff --git a/src/camps/migrations/0004_camp_ticket_sale_open.py b/src/camps/migrations/0004_camp_ticket_sale_open.py index 7826fc12..80e5d106 100644 --- a/src/camps/migrations/0004_camp_ticket_sale_open.py +++ b/src/camps/migrations/0004_camp_ticket_sale_open.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.5 on 2016-05-06 20:16 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/camps/migrations/0005_auto_20160510_2011.py b/src/camps/migrations/0005_auto_20160510_2011.py index 13bc95a1..f361d396 100644 --- a/src/camps/migrations/0005_auto_20160510_2011.py +++ b/src/camps/migrations/0005_auto_20160510_2011.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-05-10 20:11 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/camps/migrations/0006_auto_20160804_1705.py b/src/camps/migrations/0006_auto_20160804_1705.py index 8ae75891..cf2fd958 100644 --- a/src/camps/migrations/0006_auto_20160804_1705.py +++ b/src/camps/migrations/0006_auto_20160804_1705.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-08-04 17:05 -from __future__ import unicode_literals + from django.db import migrations diff --git a/src/camps/migrations/0007_auto_20161212_1803.py b/src/camps/migrations/0007_auto_20161212_1803.py index 6aa6c96e..3dc81a7a 100644 --- a/src/camps/migrations/0007_auto_20161212_1803.py +++ b/src/camps/migrations/0007_auto_20161212_1803.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-12 18:03 -from __future__ import unicode_literals + import datetime from django.conf import settings diff --git a/src/camps/migrations/0008_delete_day.py b/src/camps/migrations/0008_delete_day.py index 58ad3137..3e6fc5c8 100644 --- a/src/camps/migrations/0008_delete_day.py +++ b/src/camps/migrations/0008_delete_day.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-12 18:09 -from __future__ import unicode_literals + from django.db import migrations diff --git a/src/camps/migrations/0009_auto_20161220_1645.py b/src/camps/migrations/0009_auto_20161220_1645.py index c6214432..65bc33e4 100644 --- a/src/camps/migrations/0009_auto_20161220_1645.py +++ b/src/camps/migrations/0009_auto_20161220_1645.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-20 16:45 -from __future__ import unicode_literals + import datetime from django.db import migrations, models diff --git a/src/camps/migrations/0010_auto_20161220_1714.py b/src/camps/migrations/0010_auto_20161220_1714.py index 770763dd..8c6e605d 100644 --- a/src/camps/migrations/0010_auto_20161220_1714.py +++ b/src/camps/migrations/0010_auto_20161220_1714.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-20 17:14 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/camps/migrations/0011_auto_20161228_1750.py b/src/camps/migrations/0011_auto_20161228_1750.py index 0f304a50..74e06705 100644 --- a/src/camps/migrations/0011_auto_20161228_1750.py +++ b/src/camps/migrations/0011_auto_20161228_1750.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-28 17:50 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/camps/migrations/0012_auto_20161228_2312.py b/src/camps/migrations/0012_auto_20161228_2312.py index c9fc86fc..0af78178 100644 --- a/src/camps/migrations/0012_auto_20161228_2312.py +++ b/src/camps/migrations/0012_auto_20161228_2312.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-28 23:12 -from __future__ import unicode_literals + from django.db import migrations diff --git a/src/camps/migrations/0013_auto_20161229_2201.py b/src/camps/migrations/0013_auto_20161229_2201.py index 33298454..28a3ef6e 100644 --- a/src/camps/migrations/0013_auto_20161229_2201.py +++ b/src/camps/migrations/0013_auto_20161229_2201.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-29 22:01 -from __future__ import unicode_literals + import django.contrib.postgres.fields.ranges from django.db import migrations diff --git a/src/camps/migrations/0014_auto_20161229_2202.py b/src/camps/migrations/0014_auto_20161229_2202.py index 2b32ec52..db266ef9 100644 --- a/src/camps/migrations/0014_auto_20161229_2202.py +++ b/src/camps/migrations/0014_auto_20161229_2202.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-29 22:02 -from __future__ import unicode_literals + import django.contrib.postgres.fields.ranges from django.db import migrations diff --git a/src/camps/migrations/0015_auto_20170116_1634.py b/src/camps/migrations/0015_auto_20170116_1634.py index fa87cc72..aa7c4b5c 100644 --- a/src/camps/migrations/0015_auto_20170116_1634.py +++ b/src/camps/migrations/0015_auto_20170116_1634.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-01-16 16:34 -from __future__ import unicode_literals + from django.db import migrations diff --git a/src/camps/migrations/0016_camp_description.py b/src/camps/migrations/0016_camp_description.py index 900f6cdc..78c69f70 100644 --- a/src/camps/migrations/0016_camp_description.py +++ b/src/camps/migrations/0016_camp_description.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-01-16 16:37 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/camps/migrations/0017_remove_camp_description.py b/src/camps/migrations/0017_remove_camp_description.py index a5ade35b..ed9032d7 100644 --- a/src/camps/migrations/0017_remove_camp_description.py +++ b/src/camps/migrations/0017_remove_camp_description.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-01-16 21:59 -from __future__ import unicode_literals + from django.db import migrations diff --git a/src/camps/migrations/0018_auto_20170128_1841.py b/src/camps/migrations/0018_auto_20170128_1841.py index 160a4c7f..5814441a 100644 --- a/src/camps/migrations/0018_auto_20170128_1841.py +++ b/src/camps/migrations/0018_auto_20170128_1841.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.5 on 2017-01-28 17:41 -from __future__ import unicode_literals + import django.contrib.postgres.fields.ranges from django.db import migrations diff --git a/src/camps/models.py b/src/camps/models.py index 56e8269c..c186ad1d 100644 --- a/src/camps/models.py +++ b/src/camps/models.py @@ -91,7 +91,7 @@ class Camp(CreatedUpdatedModel, UUIDModel): field = getattr(self, camppart) if not hasattr(field, '__class__') or not hasattr(field.__class__, '__name__') or not field.__class__.__name__ == 'DateTimeTZRange': - print("this attribute is not a datetimetzrange field: %s" % field) + print(("this attribute is not a datetimetzrange field: %s" % field)) return False daycount = (field.upper - field.lower).days diff --git a/src/info/apps.py b/src/info/apps.py index f4738cf0..7fca4660 100644 --- a/src/info/apps.py +++ b/src/info/apps.py @@ -1,4 +1,4 @@ -from __future__ import unicode_literals + from django.apps import AppConfig diff --git a/src/info/migrations/0001_initial.py b/src/info/migrations/0001_initial.py index f554d348..0ea46e89 100644 --- a/src/info/migrations/0001_initial.py +++ b/src/info/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-24 22:11 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/src/info/migrations/0002_auto_20161228_2312.py b/src/info/migrations/0002_auto_20161228_2312.py index 33317daf..3a7b5b47 100644 --- a/src/info/migrations/0002_auto_20161228_2312.py +++ b/src/info/migrations/0002_auto_20161228_2312.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-28 23:12 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/info/models.py b/src/info/models.py index d7962448..ad281957 100644 --- a/src/info/models.py +++ b/src/info/models.py @@ -1,4 +1,4 @@ -from __future__ import unicode_literals + from django.contrib import messages from django.db import models from utils.models import CreatedUpdatedModel diff --git a/src/ircbot/apps.py b/src/ircbot/apps.py index f25a77f9..d057f8c7 100644 --- a/src/ircbot/apps.py +++ b/src/ircbot/apps.py @@ -1,4 +1,4 @@ -from __future__ import unicode_literals + from django.apps import AppConfig diff --git a/src/ircbot/irc3module.py b/src/ircbot/irc3module.py index feb28369..2dd2c0d2 100644 --- a/src/ircbot/irc3module.py +++ b/src/ircbot/irc3module.py @@ -24,19 +24,19 @@ class Plugin(object): def server_ready(self, **kwargs): """triggered after the server sent the MOTD (require core plugin)""" if settings.DEBUG: - print("inside server_ready(), kwargs: %s" % kwargs) + print(("inside server_ready(), kwargs: %s" % kwargs)) def connection_lost(self, **kwargs): """triggered when connection is lost""" if settings.DEBUG: - print("inside connection_lost(), kwargs: %s" % kwargs) + print(("inside connection_lost(), kwargs: %s" % kwargs)) def connection_made(self, **kwargs): """triggered when connection is up""" if settings.DEBUG: - print("inside connection_made(), kwargs: %s" % kwargs) + print(("inside connection_made(), kwargs: %s" % kwargs)) ############################################################################################### @@ -46,7 +46,7 @@ class Plugin(object): def on_join_part_quit(self, **kwargs): """triggered when there is a join part or quit on a channel the bot is in""" if settings.DEBUG: - print("inside on_join_part_quit(), kwargs: %s" % kwargs) + print(("inside on_join_part_quit(), kwargs: %s" % kwargs)) if self.bot.nick == kwargs['mask'].split("!")[0] and kwargs['channel'] == "#tirsdagsfilm": self.bot.loop.call_later(1, self.bot.get_outgoing_messages) @@ -55,13 +55,13 @@ class Plugin(object): def on_privmsg(self, **kwargs): """triggered when a privmsg is sent to the bot or to a channel the bot is in""" if settings.DEBUG: - print("inside on_privmsg(), kwargs: %s" % kwargs) + print(("inside on_privmsg(), kwargs: %s" % kwargs)) @irc3.event(irc3.rfc.KICK) def on_kick(self, **kwargs): if settings.DEBUG: - print("inside on_kick(), kwargs: %s" % kwargs) + print(("inside on_kick(), kwargs: %s" % kwargs)) ############################################################################################### @@ -78,12 +78,12 @@ class Plugin(object): print("inside get_outgoing_messages()") for msg in OutgoingIrcMessage.objects.filter(processed=False).order_by('created_date'): if msg.target[0] == "#" and msg.target in self.bot.channels: - print("sending privmsg to %s: %s" % (msg.target, msg.message)) + print(("sending privmsg to %s: %s" % (msg.target, msg.message))) self.bot.privmsg(msg.target, msg.message) msg.processed=True msg.save() else: - print("skipping message to channel %s because the bot is not in the channel" % msg.target) + print(("skipping message to channel %s because the bot is not in the channel" % msg.target)) # call this function again in 60 seconds self.bot.loop.call_later(60, self.bot.get_outgoing_messages) diff --git a/src/ircbot/migrations/0001_initial.py b/src/ircbot/migrations/0001_initial.py index ed1a4d90..538b591e 100644 --- a/src/ircbot/migrations/0001_initial.py +++ b/src/ircbot/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.5 on 2017-01-29 20:29 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/ircbot/models.py b/src/ircbot/models.py index 06eb7b68..2875a150 100644 --- a/src/ircbot/models.py +++ b/src/ircbot/models.py @@ -1,4 +1,4 @@ -from __future__ import unicode_literals + from utils.models import UUIDModel, CreatedUpdatedModel from django.db import models diff --git a/src/news/apps.py b/src/news/apps.py index de4f85fc..0077041d 100644 --- a/src/news/apps.py +++ b/src/news/apps.py @@ -1,4 +1,4 @@ -from __future__ import unicode_literals + from django.apps import AppConfig diff --git a/src/news/migrations/0001_initial.py b/src/news/migrations/0001_initial.py index 12659c44..24e2a719 100644 --- a/src/news/migrations/0001_initial.py +++ b/src/news/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-05-30 19:12 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/news/migrations/0002_auto_20160530_2223.py b/src/news/migrations/0002_auto_20160530_2223.py index 63852d09..2814320d 100644 --- a/src/news/migrations/0002_auto_20160530_2223.py +++ b/src/news/migrations/0002_auto_20160530_2223.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-05-30 22:23 -from __future__ import unicode_literals + from django.db import migrations diff --git a/src/news/migrations/0003_newsitem_slug.py b/src/news/migrations/0003_newsitem_slug.py index b658b221..af57db5e 100644 --- a/src/news/migrations/0003_newsitem_slug.py +++ b/src/news/migrations/0003_newsitem_slug.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.2 on 2016-06-05 21:26 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/news/migrations/0004_auto_20160610_1743.py b/src/news/migrations/0004_auto_20160610_1743.py index 48ec0768..18b6285e 100644 --- a/src/news/migrations/0004_auto_20160610_1743.py +++ b/src/news/migrations/0004_auto_20160610_1743.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-06-10 17:43 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/news/migrations/0005_auto_20160618_1902.py b/src/news/migrations/0005_auto_20160618_1902.py index 5deac5bb..d80a85f8 100644 --- a/src/news/migrations/0005_auto_20160618_1902.py +++ b/src/news/migrations/0005_auto_20160618_1902.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.2 on 2016-06-18 19:02 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/news/migrations/0006_remove_newsitem_public.py b/src/news/migrations/0006_remove_newsitem_public.py index 6577b1bc..32333cec 100644 --- a/src/news/migrations/0006_remove_newsitem_public.py +++ b/src/news/migrations/0006_remove_newsitem_public.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-20 11:27 -from __future__ import unicode_literals + from django.db import migrations diff --git a/src/news/migrations/0007_auto_20161220_1136.py b/src/news/migrations/0007_auto_20161220_1136.py index 7d03a585..16cd134c 100644 --- a/src/news/migrations/0007_auto_20161220_1136.py +++ b/src/news/migrations/0007_auto_20161220_1136.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-20 11:36 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/news/migrations/0008_newsitem_archived.py b/src/news/migrations/0008_newsitem_archived.py index ec2cf548..3569e1bb 100644 --- a/src/news/migrations/0008_newsitem_archived.py +++ b/src/news/migrations/0008_newsitem_archived.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-20 13:03 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/news/models.py b/src/news/models.py index 7e6995c7..ee8a028e 100644 --- a/src/news/models.py +++ b/src/news/models.py @@ -1,4 +1,4 @@ -from __future__ import unicode_literals + from django.db import models from django.utils import encoding diff --git a/src/profiles/migrations/0001_initial.py b/src/profiles/migrations/0001_initial.py index 74b67103..95aa9c79 100644 --- a/src/profiles/migrations/0001_initial.py +++ b/src/profiles/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import models, migrations from django.conf import settings diff --git a/src/program/migrations/0001_initial.py b/src/program/migrations/0001_initial.py index ade6047f..76f0b785 100644 --- a/src/program/migrations/0001_initial.py +++ b/src/program/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-07-13 19:38 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/src/program/migrations/0002_eventtype_color.py b/src/program/migrations/0002_eventtype_color.py index b7f91fc3..b8328db1 100644 --- a/src/program/migrations/0002_eventtype_color.py +++ b/src/program/migrations/0002_eventtype_color.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-08-04 17:05 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/program/migrations/0003_eventtype_light_writing.py b/src/program/migrations/0003_eventtype_light_writing.py index 7d4dac56..32b8c740 100644 --- a/src/program/migrations/0003_eventtype_light_writing.py +++ b/src/program/migrations/0003_eventtype_light_writing.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-08-04 17:11 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/program/migrations/0004_auto_20160804_1712.py b/src/program/migrations/0004_auto_20160804_1712.py index e93a05c1..603219b2 100644 --- a/src/program/migrations/0004_auto_20160804_1712.py +++ b/src/program/migrations/0004_auto_20160804_1712.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-08-04 17:12 -from __future__ import unicode_literals + from django.db import migrations diff --git a/src/program/migrations/0005_auto_20160807_1312.py b/src/program/migrations/0005_auto_20160807_1312.py index ffe56c25..69719ef8 100644 --- a/src/program/migrations/0005_auto_20160807_1312.py +++ b/src/program/migrations/0005_auto_20160807_1312.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-08-07 13:12 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/program/migrations/0006_auto_20160807_1320.py b/src/program/migrations/0006_auto_20160807_1320.py index e26841e8..74a6add4 100644 --- a/src/program/migrations/0006_auto_20160807_1320.py +++ b/src/program/migrations/0006_auto_20160807_1320.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-08-07 13:20 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/program/migrations/0007_auto_20160807_1333.py b/src/program/migrations/0007_auto_20160807_1333.py index fe9ba2a2..e4f9377c 100644 --- a/src/program/migrations/0007_auto_20160807_1333.py +++ b/src/program/migrations/0007_auto_20160807_1333.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-08-07 13:33 -from __future__ import unicode_literals + from django.db import migrations diff --git a/src/program/migrations/0008_auto_20160808_1747.py b/src/program/migrations/0008_auto_20160808_1747.py index 17ec0231..f6c8b506 100644 --- a/src/program/migrations/0008_auto_20160808_1747.py +++ b/src/program/migrations/0008_auto_20160808_1747.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.2 on 2016-08-08 17:47 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/program/migrations/0009_auto_20160827_0752.py b/src/program/migrations/0009_auto_20160827_0752.py index a4b2e3f2..2c473742 100644 --- a/src/program/migrations/0009_auto_20160827_0752.py +++ b/src/program/migrations/0009_auto_20160827_0752.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-08-27 07:52 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/program/migrations/0010_auto_20161212_1809.py b/src/program/migrations/0010_auto_20161212_1809.py index e85ea059..19642387 100644 --- a/src/program/migrations/0010_auto_20161212_1809.py +++ b/src/program/migrations/0010_auto_20161212_1809.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-12 18:09 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/src/program/migrations/0011_auto_20161229_2149.py b/src/program/migrations/0011_auto_20161229_2149.py index 3dd59539..ac4da61a 100644 --- a/src/program/migrations/0011_auto_20161229_2149.py +++ b/src/program/migrations/0011_auto_20161229_2149.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-29 21:49 -from __future__ import unicode_literals + import django.contrib.postgres.fields.ranges from django.db import migrations diff --git a/src/program/migrations/0012_auto_20161229_2150.py b/src/program/migrations/0012_auto_20161229_2150.py index 3afafad9..1acc7768 100644 --- a/src/program/migrations/0012_auto_20161229_2150.py +++ b/src/program/migrations/0012_auto_20161229_2150.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-29 21:50 -from __future__ import unicode_literals + import django.contrib.postgres.fields.ranges from django.db import migrations diff --git a/src/program/migrations/0013_auto_20170121_1312.py b/src/program/migrations/0013_auto_20170121_1312.py index 1784940f..62ffacfa 100644 --- a/src/program/migrations/0013_auto_20170121_1312.py +++ b/src/program/migrations/0013_auto_20170121_1312.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.5 on 2017-01-21 12:12 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/src/program/migrations/0014_speaker_camp.py b/src/program/migrations/0014_speaker_camp.py index cf77438c..704d3a12 100644 --- a/src/program/migrations/0014_speaker_camp.py +++ b/src/program/migrations/0014_speaker_camp.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.5 on 2017-01-22 13:39 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/src/program/migrations/0015_auto_20170128_1841.py b/src/program/migrations/0015_auto_20170128_1841.py index 37296489..6fb2c8b9 100644 --- a/src/program/migrations/0015_auto_20170128_1841.py +++ b/src/program/migrations/0015_auto_20170128_1841.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.5 on 2017-01-28 17:41 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/src/program/models.py b/src/program/models.py index 6bfc71f2..b5b7c784 100644 --- a/src/program/models.py +++ b/src/program/models.py @@ -1,4 +1,4 @@ -from __future__ import unicode_literals + from django.contrib.postgres.fields import DateTimeRangeField from django.db import models from django.utils.text import slugify diff --git a/src/shop/email.py b/src/shop/email.py index 042cb5c2..8d82e818 100644 --- a/src/shop/email.py +++ b/src/shop/email.py @@ -18,7 +18,7 @@ def send_email(emailtype, recipient, formatdict, subject, sender='BornHack