From 21b2a01a84132205aaaaa1b35fd8789afe4a133b Mon Sep 17 00:00:00 2001 From: Sachi King Date: Sat, 22 Apr 2017 10:06:04 +1000 Subject: [PATCH] Py2 compatability has been broke elsewhere drop it This is all noop in Py3, and Py2 is broke now in various places. Dropping Py2 code as it will not be a thing going forward. Django 2 is the next release, Py2 support will be dropped, as such, dropping this is forward looking. --- setup.py | 2 +- symposion/conference/apps.py | 1 - symposion/conference/migrations/0001_initial.py | 2 -- symposion/conference/models.py | 4 ---- symposion/markdown_parser.py | 2 -- symposion/proposals/actions.py | 1 - symposion/proposals/apps.py | 1 - symposion/proposals/forms.py | 1 - symposion/proposals/migrations/0001_initial.py | 2 -- symposion/proposals/models.py | 6 ------ symposion/proposals/views.py | 1 - symposion/reviews/apps.py | 1 - symposion/reviews/forms.py | 1 - symposion/reviews/migrations/0001_initial.py | 2 -- symposion/reviews/models.py | 1 - symposion/reviews/utils.py | 3 --- symposion/schedule/admin.py | 1 - symposion/schedule/apps.py | 1 - symposion/schedule/forms.py | 1 - symposion/schedule/helpers.py | 1 - symposion/schedule/migrations/0001_initial.py | 2 -- .../migrations/0002_presentation_unpublish.py | 2 -- .../schedule/migrations/0003_auto_20161113_1530.py | 2 -- .../schedule/migrations/0003_slot_exclusive.py | 2 -- symposion/schedule/migrations/0004_merge.py | 2 -- .../schedule/migrations/0005_auto_20161210_1736.py | 2 -- symposion/schedule/migrations/0006_room_track.py | 2 -- .../schedule/migrations/0007_auto_20161224_1709.py | 2 -- symposion/schedule/models.py | 13 ------------- symposion/schedule/timetable.py | 1 - symposion/schedule/urls.py | 1 - symposion/schedule/views.py | 1 - symposion/speakers/admin.py | 1 - symposion/speakers/apps.py | 1 - symposion/speakers/forms.py | 1 - symposion/speakers/migrations/0001_initial.py | 2 -- .../speakers/migrations/0002_auto_20161230_1900.py | 2 -- symposion/speakers/models.py | 4 ---- symposion/speakers/urls.py | 1 - symposion/speakers/views.py | 1 - symposion/sponsorship/admin.py | 2 -- symposion/sponsorship/apps.py | 1 - symposion/sponsorship/forms.py | 1 - symposion/sponsorship/migrations/0001_initial.py | 2 -- symposion/sponsorship/models.py | 8 -------- symposion/sponsorship/views.py | 7 +------ symposion/teams/forms.py | 1 - symposion/teams/migrations/0001_initial.py | 2 -- symposion/teams/models.py | 4 ---- symposion/teams/views.py | 1 - symposion/views.py | 2 -- 51 files changed, 2 insertions(+), 109 deletions(-) diff --git a/setup.py b/setup.py index bdf75e6f..e19058cb 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ setup( include_package_data=True, classifiers=( "Development Status :: 4 - Beta", - "Programming Language :: Python", + "Programming Language :: Python :: 3 :: Only", "Framework :: Django", "Intended Audience :: Developers", "Natural Language :: English", diff --git a/symposion/conference/apps.py b/symposion/conference/apps.py index 45e19ffb..7a330359 100644 --- a/symposion/conference/apps.py +++ b/symposion/conference/apps.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django.apps import AppConfig from django.utils.translation import ugettext_lazy as _ diff --git a/symposion/conference/migrations/0001_initial.py b/symposion/conference/migrations/0001_initial.py index 888dcf63..c9922906 100644 --- a/symposion/conference/migrations/0001_initial.py +++ b/symposion/conference/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-09-17 03:34 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion import timezone_field.fields diff --git a/symposion/conference/models.py b/symposion/conference/models.py index ae6c1bea..14e5ad3f 100644 --- a/symposion/conference/models.py +++ b/symposion/conference/models.py @@ -1,7 +1,5 @@ -from __future__ import unicode_literals from django.db import models from django.utils.translation import ugettext_lazy as _ -from django.utils.encoding import python_2_unicode_compatible from timezone_field import TimeZoneField @@ -9,7 +7,6 @@ from timezone_field import TimeZoneField CONFERENCE_CACHE = {} -@python_2_unicode_compatible class Conference(models.Model): """ the full conference for a specific year, e.g. US PyCon 2012. @@ -45,7 +42,6 @@ class Conference(models.Model): verbose_name_plural = _("conferences") -@python_2_unicode_compatible class Section(models.Model): """ a section of the conference such as "Tutorials", "Workshops", diff --git a/symposion/markdown_parser.py b/symposion/markdown_parser.py index d92a5020..f5495336 100644 --- a/symposion/markdown_parser.py +++ b/symposion/markdown_parser.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import bleach import markdown diff --git a/symposion/proposals/actions.py b/symposion/proposals/actions.py index f5dfd19f..7317f88e 100644 --- a/symposion/proposals/actions.py +++ b/symposion/proposals/actions.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals import csv from django.http import HttpResponse diff --git a/symposion/proposals/apps.py b/symposion/proposals/apps.py index 613471ce..c35c024c 100644 --- a/symposion/proposals/apps.py +++ b/symposion/proposals/apps.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django.apps import AppConfig from django.utils.translation import ugettext_lazy as _ diff --git a/symposion/proposals/forms.py b/symposion/proposals/forms.py index d42689cf..4dd40327 100644 --- a/symposion/proposals/forms.py +++ b/symposion/proposals/forms.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django import forms from django.db.models import Q from django.utils.translation import ugettext_lazy as _ diff --git a/symposion/proposals/migrations/0001_initial.py b/symposion/proposals/migrations/0001_initial.py index e66fc130..318becc2 100644 --- a/symposion/proposals/migrations/0001_initial.py +++ b/symposion/proposals/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-09-17 03:35 -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/symposion/proposals/models.py b/symposion/proposals/models.py index bdf43ffd..2b9d43a1 100644 --- a/symposion/proposals/models.py +++ b/symposion/proposals/models.py @@ -1,11 +1,9 @@ -from __future__ import unicode_literals import os import uuid from django.core.urlresolvers import reverse from django.db import models from django.db.models import Q -from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ from django.utils.timezone import now @@ -21,7 +19,6 @@ from symposion.conference.models import Section from symposion.speakers.models import Speaker -@python_2_unicode_compatible class ProposalSection(models.Model): """ configuration of proposal submissions for a specific Section. @@ -60,7 +57,6 @@ class ProposalSection(models.Model): return self.section.name -@python_2_unicode_compatible class ProposalKind(models.Model): """ e.g. talk vs panel vs tutorial vs poster @@ -78,7 +74,6 @@ class ProposalKind(models.Model): return self.name -@python_2_unicode_compatible class ProposalBase(models.Model): objects = InheritanceManager() @@ -209,7 +204,6 @@ class ProposalBase(models.Model): reversion.register(ProposalBase) -@python_2_unicode_compatible class AdditionalSpeaker(models.Model): SPEAKING_STATUS_PENDING = 1 diff --git a/symposion/proposals/views.py b/symposion/proposals/views.py index 7d5983b9..07e735a0 100644 --- a/symposion/proposals/views.py +++ b/symposion/proposals/views.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals import hashlib import random import sys diff --git a/symposion/reviews/apps.py b/symposion/reviews/apps.py index 4973fa43..80fab5c3 100644 --- a/symposion/reviews/apps.py +++ b/symposion/reviews/apps.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django.apps import AppConfig from django.utils.translation import ugettext_lazy as _ diff --git a/symposion/reviews/forms.py b/symposion/reviews/forms.py index 6e8c5701..03c4b6ef 100644 --- a/symposion/reviews/forms.py +++ b/symposion/reviews/forms.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django import forms from django.utils.translation import ugettext_lazy as _ diff --git a/symposion/reviews/migrations/0001_initial.py b/symposion/reviews/migrations/0001_initial.py index dbbece21..39af922a 100644 --- a/symposion/reviews/migrations/0001_initial.py +++ b/symposion/reviews/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-09-17 03:35 -from __future__ import unicode_literals - import datetime from decimal import Decimal from django.conf import settings diff --git a/symposion/reviews/models.py b/symposion/reviews/models.py index 63c190cf..a92bf483 100644 --- a/symposion/reviews/models.py +++ b/symposion/reviews/models.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals from datetime import datetime from decimal import Decimal diff --git a/symposion/reviews/utils.py b/symposion/reviews/utils.py index 1d45e95a..80e87e49 100644 --- a/symposion/reviews/utils.py +++ b/symposion/reviews/utils.py @@ -1,6 +1,3 @@ -from __future__ import unicode_literals - - def has_permission(user, proposal, speaker=False, reviewer=False): """ Returns whether or not ther user has permission to review this proposal, diff --git a/symposion/schedule/admin.py b/symposion/schedule/admin.py index 7cf59ecb..148b611a 100644 --- a/symposion/schedule/admin.py +++ b/symposion/schedule/admin.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django.contrib import admin from symposion.schedule.models import Schedule, Day, Room, SlotKind, Slot, SlotRoom, Presentation, Session, SessionRole, Track diff --git a/symposion/schedule/apps.py b/symposion/schedule/apps.py index d1c0ecb0..03773bdc 100644 --- a/symposion/schedule/apps.py +++ b/symposion/schedule/apps.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django.apps import AppConfig diff --git a/symposion/schedule/forms.py b/symposion/schedule/forms.py index 41695259..60fe8c55 100644 --- a/symposion/schedule/forms.py +++ b/symposion/schedule/forms.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals import csv import time diff --git a/symposion/schedule/helpers.py b/symposion/schedule/helpers.py index 2802f489..02e964a7 100644 --- a/symposion/schedule/helpers.py +++ b/symposion/schedule/helpers.py @@ -2,7 +2,6 @@ This file contains functions that are useful to humans at the shell for manipulating the database in more natural ways. """ -from __future__ import unicode_literals from django.db import transaction from .models import Schedule, Day, Room, Slot, SlotKind, SlotRoom diff --git a/symposion/schedule/migrations/0001_initial.py b/symposion/schedule/migrations/0001_initial.py index 9750d3d3..fb2c3629 100644 --- a/symposion/schedule/migrations/0001_initial.py +++ b/symposion/schedule/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-09-17 03:35 -from __future__ import unicode_literals - import datetime from django.conf import settings from django.db import migrations, models diff --git a/symposion/schedule/migrations/0002_presentation_unpublish.py b/symposion/schedule/migrations/0002_presentation_unpublish.py index 8e2a7cab..fdf576b7 100644 --- a/symposion/schedule/migrations/0002_presentation_unpublish.py +++ b/symposion/schedule/migrations/0002_presentation_unpublish.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-09-18 00:43 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/symposion/schedule/migrations/0003_auto_20161113_1530.py b/symposion/schedule/migrations/0003_auto_20161113_1530.py index 61f02b21..9277148f 100644 --- a/symposion/schedule/migrations/0003_auto_20161113_1530.py +++ b/symposion/schedule/migrations/0003_auto_20161113_1530.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-11-13 04:30 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/symposion/schedule/migrations/0003_slot_exclusive.py b/symposion/schedule/migrations/0003_slot_exclusive.py index 9fc0d847..359376d3 100644 --- a/symposion/schedule/migrations/0003_slot_exclusive.py +++ b/symposion/schedule/migrations/0003_slot_exclusive.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-12-09 20:53 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/symposion/schedule/migrations/0004_merge.py b/symposion/schedule/migrations/0004_merge.py index b89bc7cd..36096261 100644 --- a/symposion/schedule/migrations/0004_merge.py +++ b/symposion/schedule/migrations/0004_merge.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-12-10 06:05 -from __future__ import unicode_literals - from django.db import migrations diff --git a/symposion/schedule/migrations/0005_auto_20161210_1736.py b/symposion/schedule/migrations/0005_auto_20161210_1736.py index e4b5e49d..f05a41d0 100644 --- a/symposion/schedule/migrations/0005_auto_20161210_1736.py +++ b/symposion/schedule/migrations/0005_auto_20161210_1736.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-12-10 06:36 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/symposion/schedule/migrations/0006_room_track.py b/symposion/schedule/migrations/0006_room_track.py index 3e88890f..67a70b08 100644 --- a/symposion/schedule/migrations/0006_room_track.py +++ b/symposion/schedule/migrations/0006_room_track.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-12-24 00:10 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/symposion/schedule/migrations/0007_auto_20161224_1709.py b/symposion/schedule/migrations/0007_auto_20161224_1709.py index 2ddbfafb..d6eeb236 100644 --- a/symposion/schedule/migrations/0007_auto_20161224_1709.py +++ b/symposion/schedule/migrations/0007_auto_20161224_1709.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-12-24 06:09 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/symposion/schedule/models.py b/symposion/schedule/models.py index c4807df6..0e2307b2 100644 --- a/symposion/schedule/models.py +++ b/symposion/schedule/models.py @@ -1,11 +1,8 @@ -from __future__ import unicode_literals - import datetime from django.core.exceptions import ObjectDoesNotExist from django.contrib.auth.models import User from django.db import models -from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ from symposion.markdown_parser import parse @@ -14,7 +11,6 @@ from symposion.conference.models import Section from symposion.speakers.models import Speaker -@python_2_unicode_compatible class Schedule(models.Model): section = models.OneToOneField(Section, verbose_name=_("Section")) @@ -30,7 +26,6 @@ class Schedule(models.Model): verbose_name_plural = _('Schedules') -@python_2_unicode_compatible class Day(models.Model): schedule = models.ForeignKey(Schedule, verbose_name=_("Schedule")) @@ -46,7 +41,6 @@ class Day(models.Model): verbose_name_plural = _("dates") -@python_2_unicode_compatible class Room(models.Model): schedule = models.ForeignKey(Schedule, verbose_name=_("Schedule")) @@ -61,7 +55,6 @@ class Room(models.Model): verbose_name_plural = _("Rooms") -@python_2_unicode_compatible class Track(models.Model): name = models.CharField(max_length=80, verbose_name=_("Track")) room = models.ForeignKey(Room) @@ -76,7 +69,6 @@ class Track(models.Model): verbose_name_plural = _("Tracks") -@python_2_unicode_compatible class SlotKind(models.Model): """ A slot kind represents what kind a slot is. For example, a slot can be a @@ -94,7 +86,6 @@ class SlotKind(models.Model): verbose_name_plural = _("Slot kinds") -@python_2_unicode_compatible class Slot(models.Model): name = models.CharField(max_length=512, editable=False) @@ -181,7 +172,6 @@ class Slot(models.Model): verbose_name_plural = _("slots") -@python_2_unicode_compatible class SlotRoom(models.Model): """ Links a slot with a room. @@ -200,7 +190,6 @@ class SlotRoom(models.Model): verbose_name_plural = _("Slot rooms") -@python_2_unicode_compatible class Presentation(models.Model): slot = models.OneToOneField(Slot, null=True, blank=True, related_name="content_ptr", verbose_name=_("Slot")) @@ -247,7 +236,6 @@ class Presentation(models.Model): verbose_name_plural = _("presentations") -@python_2_unicode_compatible class Session(models.Model): day = models.ForeignKey(Day, related_name="sessions", verbose_name=_("Day")) @@ -292,7 +280,6 @@ class Session(models.Model): verbose_name_plural = _("Sessions") -@python_2_unicode_compatible class SessionRole(models.Model): SESSION_ROLE_CHAIR = 1 diff --git a/symposion/schedule/timetable.py b/symposion/schedule/timetable.py index d5f422b0..7ce03460 100644 --- a/symposion/schedule/timetable.py +++ b/symposion/schedule/timetable.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals import itertools from django.db.models import Count, Min diff --git a/symposion/schedule/urls.py b/symposion/schedule/urls.py index f6f3f900..1b8b5eee 100644 --- a/symposion/schedule/urls.py +++ b/symposion/schedule/urls.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django.conf.urls import url from .views import ( diff --git a/symposion/schedule/views.py b/symposion/schedule/views.py index f7375523..6983bdbb 100644 --- a/symposion/schedule/views.py +++ b/symposion/schedule/views.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals import json import pytz diff --git a/symposion/speakers/admin.py b/symposion/speakers/admin.py index 95d4b28a..6331ab7b 100644 --- a/symposion/speakers/admin.py +++ b/symposion/speakers/admin.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django.contrib import admin from symposion.speakers.models import Speaker diff --git a/symposion/speakers/apps.py b/symposion/speakers/apps.py index bd6024ba..c772a12a 100644 --- a/symposion/speakers/apps.py +++ b/symposion/speakers/apps.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django.apps import AppConfig from django.utils.translation import ugettext_lazy as _ diff --git a/symposion/speakers/forms.py b/symposion/speakers/forms.py index 9c82113a..5f2aece9 100644 --- a/symposion/speakers/forms.py +++ b/symposion/speakers/forms.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django import forms from symposion.speakers.models import Speaker diff --git a/symposion/speakers/migrations/0001_initial.py b/symposion/speakers/migrations/0001_initial.py index aacf963f..e6dc8deb 100644 --- a/symposion/speakers/migrations/0001_initial.py +++ b/symposion/speakers/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-09-17 03:35 -from __future__ import unicode_literals - import datetime from django.conf import settings from django.db import migrations, models diff --git a/symposion/speakers/migrations/0002_auto_20161230_1900.py b/symposion/speakers/migrations/0002_auto_20161230_1900.py index 68444662..47eb7a77 100644 --- a/symposion/speakers/migrations/0002_auto_20161230_1900.py +++ b/symposion/speakers/migrations/0002_auto_20161230_1900.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-12-30 08:09 -from __future__ import unicode_literals - from django.db import migrations diff --git a/symposion/speakers/models.py b/symposion/speakers/models.py index 98d0d8a8..5ed69866 100644 --- a/symposion/speakers/models.py +++ b/symposion/speakers/models.py @@ -1,10 +1,7 @@ -from __future__ import unicode_literals - import datetime from django.core.urlresolvers import reverse from django.db import models -from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ from django.contrib.auth.models import User @@ -12,7 +9,6 @@ from django.contrib.auth.models import User from symposion.markdown_parser import parse -@python_2_unicode_compatible class Speaker(models.Model): SESSION_COUNT_CHOICES = [ diff --git a/symposion/speakers/urls.py b/symposion/speakers/urls.py index dd1a7bd6..a3cf7e2c 100644 --- a/symposion/speakers/urls.py +++ b/symposion/speakers/urls.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django.conf.urls import url from .views import ( diff --git a/symposion/speakers/views.py b/symposion/speakers/views.py index 9ed32ec4..a0069c10 100644 --- a/symposion/speakers/views.py +++ b/symposion/speakers/views.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django.core.exceptions import ObjectDoesNotExist from django.http import Http404 from django.shortcuts import render, redirect, get_object_or_404 diff --git a/symposion/sponsorship/admin.py b/symposion/sponsorship/admin.py index 15b09439..0a9272ac 100644 --- a/symposion/sponsorship/admin.py +++ b/symposion/sponsorship/admin.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.utils.html import escape from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ diff --git a/symposion/sponsorship/apps.py b/symposion/sponsorship/apps.py index 92ee49cd..3d2d5d62 100644 --- a/symposion/sponsorship/apps.py +++ b/symposion/sponsorship/apps.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django.apps import AppConfig from django.utils.translation import ugettext_lazy as _ diff --git a/symposion/sponsorship/forms.py b/symposion/sponsorship/forms.py index 1ca959a5..100ea8db 100644 --- a/symposion/sponsorship/forms.py +++ b/symposion/sponsorship/forms.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django import forms from django.forms.models import inlineformset_factory, BaseInlineFormSet diff --git a/symposion/sponsorship/migrations/0001_initial.py b/symposion/sponsorship/migrations/0001_initial.py index 29a8cc05..1cbbc389 100644 --- a/symposion/sponsorship/migrations/0001_initial.py +++ b/symposion/sponsorship/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-09-17 03:35 -from __future__ import unicode_literals - import datetime from django.conf import settings from django.db import migrations, models diff --git a/symposion/sponsorship/models.py b/symposion/sponsorship/models.py index f93bf8c2..cd256d11 100644 --- a/symposion/sponsorship/models.py +++ b/symposion/sponsorship/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from django.conf import settings @@ -7,7 +5,6 @@ from django.core.exceptions import ValidationError from django.core.urlresolvers import reverse from django.db import models from django.db.models.signals import post_init, post_save -from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ from django.contrib.auth.models import User @@ -45,7 +42,6 @@ BENEFITS = [ ] -@python_2_unicode_compatible class SponsorLevel(models.Model): conference = models.ForeignKey(Conference, verbose_name=_("Conference")) @@ -66,7 +62,6 @@ class SponsorLevel(models.Model): return self.sponsor_set.filter(active=True).order_by("added") -@python_2_unicode_compatible class Sponsor(models.Model): applicant = models.ForeignKey(User, related_name="sponsorships", verbose_name=_("Applicant"), @@ -232,7 +227,6 @@ CONTENT_TYPE_CHOICES = [ ] -@python_2_unicode_compatible class Benefit(models.Model): name = models.CharField(_("Name"), max_length=100) @@ -246,7 +240,6 @@ class Benefit(models.Model): return self.name -@python_2_unicode_compatible class BenefitLevel(models.Model): benefit = models.ForeignKey(Benefit, related_name="benefit_levels", verbose_name=_("Benefit")) @@ -265,7 +258,6 @@ class BenefitLevel(models.Model): return "%s - %s" % (self.level, self.benefit) -@python_2_unicode_compatible class SponsorBenefit(models.Model): sponsor = models.ForeignKey(Sponsor, related_name="sponsor_benefits", verbose_name=_("Sponsor")) diff --git a/symposion/sponsorship/views.py b/symposion/sponsorship/views.py index d3bd47fe..bc5acf8f 100644 --- a/symposion/sponsorship/views.py +++ b/symposion/sponsorship/views.py @@ -1,9 +1,4 @@ -from __future__ import unicode_literals -try: - from io import StringIO -except: - # Python 2 - from cStringIO import StringIO +from io import StringIO import itertools import logging import os diff --git a/symposion/teams/forms.py b/symposion/teams/forms.py index aea42279..5ba8ccae 100644 --- a/symposion/teams/forms.py +++ b/symposion/teams/forms.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django import forms from django.utils.html import escape diff --git a/symposion/teams/migrations/0001_initial.py b/symposion/teams/migrations/0001_initial.py index 3bdd4120..513093db 100644 --- a/symposion/teams/migrations/0001_initial.py +++ b/symposion/teams/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models, migrations import datetime from django.conf import settings diff --git a/symposion/teams/models.py b/symposion/teams/models.py index f6ab7253..ca197272 100644 --- a/symposion/teams/models.py +++ b/symposion/teams/models.py @@ -1,9 +1,6 @@ -from __future__ import unicode_literals - import datetime from django.db import models -from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ from django.contrib.auth.models import Permission, User @@ -18,7 +15,6 @@ TEAM_ACCESS_CHOICES = [ ] -@python_2_unicode_compatible class Team(models.Model): slug = models.SlugField(unique=True, verbose_name=_("Slug")) diff --git a/symposion/teams/views.py b/symposion/teams/views.py index be11be7f..9c85beeb 100644 --- a/symposion/teams/views.py +++ b/symposion/teams/views.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django.http import Http404, HttpResponseNotAllowed from django.shortcuts import render, redirect, get_object_or_404 diff --git a/symposion/views.py b/symposion/views.py index a03545eb..a94853b9 100644 --- a/symposion/views.py +++ b/symposion/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.auth.decorators import login_required from django.shortcuts import render, redirect