symposion_app Changeset - ffd428d49720

Changeset - ffd428d49720

Parent rev.

Child rev.

[Not reviewed]

Merge

0 37 0

Patrick Altman - 9 years ago 2015-09-08 19:55:49
paltman@gmail.com

Merge pull request #100 from miurahr/python3_compatibility

python3 compatibility

36 files changed with 110 insertions and 38 deletions:

symposion/boxes/models.py

symposion/cms/models.py

symposion/conference/apps.py

symposion/conference/models.py

symposion/markdown_parser.py

symposion/proposals/actions.py

symposion/proposals/apps.py

symposion/proposals/forms.py

symposion/proposals/models.py

symposion/proposals/views.py

symposion/reviews/apps.py

symposion/reviews/forms.py

symposion/reviews/models.py

symposion/reviews/utils.py

symposion/schedule/admin.py

symposion/schedule/apps.py

symposion/schedule/forms.py

symposion/schedule/helpers.py

symposion/schedule/models.py

symposion/schedule/timetable.py

symposion/schedule/urls.py

symposion/schedule/views.py

symposion/speakers/admin.py

symposion/speakers/apps.py

symposion/speakers/forms.py

symposion/speakers/models.py

symposion/speakers/urls.py

symposion/speakers/views.py

symposion/sponsorship/admin.py

symposion/sponsorship/forms.py

symposion/sponsorship/models.py

symposion/sponsorship/views.py

symposion/teams/forms.py

symposion/teams/models.py

symposion/teams/views.py

symposion/views.py

0 comments (0 inline, 0 general)

symposion/boxes/models.py

➞

Show inline comments

 from __future__ import unicode_literals
 from django.db import models
 from django.contrib.auth.models import User
 from django.utils.encoding import python_2_unicode_compatible
@@ ... / @@ -8,2 +10,3 @@ from markitup.fields import MarkupField @@
 @python_2_unicode_compatible
 class Box(models.Model):
@@ ... / @@ -16,3 +19,3 @@ class Box(models.Model): @@
-    def __unicode__(self):
+    def __str__(self):
         return self.label

symposion/cms/models.py

➞

Show inline comments

@@ ... / @@ -8,2 +8,3 @@ from django.core.exceptions import ValidationError @@
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
@@ ... / @@ -19,2 +20,3 @@ from .managers import PublishedPageManager @@
 @python_2_unicode_compatible
 class Page(models.Model):
@@ ... / @@ -37,3 +39,3 @@ class Page(models.Model): @@
-    def __unicode__(self):
+    def __str__(self):
         return self.title

symposion/conference/apps.py

➞

Show inline comments

		from __future__ import unicode_literals
		from django.apps import AppConfig

symposion/conference/models.py

➞

Show inline comments

 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
@@ ... / @@ -9,2 +11,3 @@ CONFERENCE_CACHE = {} @@
 @python_2_unicode_compatible
 class Conference(models.Model):
@@ ... / @@ -23,3 +26,3 @@ class Conference(models.Model): @@
-    def __unicode__(self):
+    def __str__(self):
         return self.title
@@ ... / @@ -44,2 +47,3 @@ class Conference(models.Model): @@
 @python_2_unicode_compatible
 class Section(models.Model):
@@ ... / @@ -60,4 +64,4 @@ class Section(models.Model): @@
     def __unicode__(self):
         return u"%s %s" % (self.conference, self.name)
     def __str__(self):
         return "%s %s" % (self.conference, self.name)

symposion/markdown_parser.py

➞

Show inline comments

		from __future__ import unicode_literals
		from html5lib import html5parser, sanitizer

symposion/proposals/actions.py

➞

Show inline comments

		from __future__ import unicode_literals
		import csv

symposion/proposals/apps.py

➞

Show inline comments

		from __future__ import unicode_literals
		from django.apps import AppConfig

symposion/proposals/forms.py

➞

Show inline comments

		from __future__ import unicode_literals
		from django import forms

symposion/proposals/models.py

➞

Show inline comments

 from __future__ import unicode_literals
 import os
@@ ... / @@ -6,2 +7,3 @@ 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 _
@@ ... / @@ -23,2 +25,3 @@ from symposion.speakers.models import Speaker @@
 @python_2_unicode_compatible
 class ProposalSection(models.Model):
@@ ... / @@ -57,3 +60,3 @@ class ProposalSection(models.Model): @@
-    def __unicode__(self):
+    def __str__(self):
         return self.section.name
@@ ... / @@ -61,2 +64,3 @@ class ProposalSection(models.Model): @@
 @python_2_unicode_compatible
 class ProposalKind(models.Model):
@@ ... / @@ -74,3 +78,3 @@ class ProposalKind(models.Model): @@
-    def __unicode__(self):
+    def __str__(self):
         return self.name
@@ ... / @@ -78,2 +82,3 @@ class ProposalKind(models.Model): @@
 @python_2_unicode_compatible
 class ProposalBase(models.Model):
@@ ... / @@ -157,2 +162,5 @@ class ProposalBase(models.Model): @@
     def __str__(self):
         return self.title
 reversion.register(ProposalBase)
@@ ... / @@ -160,2 +168,3 @@ reversion.register(ProposalBase) @@
 @python_2_unicode_compatible
 class AdditionalSpeaker(models.Model):
@@ ... / @@ -179,3 +188,3 @@ class AdditionalSpeaker(models.Model): @@
-    def __unicode__(self):
+    def __str__(self):
         if self.status is self.SPEAKING_STATUS_PENDING:

symposion/proposals/views.py

➞

Show inline comments

		from __future__ import unicode_literals
		import hashlib

symposion/reviews/apps.py

➞

Show inline comments

		from __future__ import unicode_literals
		from django.apps import AppConfig

symposion/reviews/forms.py

➞

Show inline comments

		from __future__ import unicode_literals
		from django import forms

symposion/reviews/models.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 from datetime import datetime
@@ ... / @@ -29,4 +30,4 @@ class Votes(object): @@
     PLUS_ZERO = "+0"
     MINUS_ZERO = u"−0"
     MINUS_ONE = u"−1"
     MINUS_ZERO = "−0"
     MINUS_ONE = "−1"

symposion/reviews/utils.py

➞

Show inline comments

		from __future__ import unicode_literals


		def has_permission(user, proposal, speaker=False, reviewer=False):

symposion/schedule/admin.py

➞

Show inline comments

		from __future__ import unicode_literals
		from django.contrib import admin

symposion/schedule/apps.py

➞

Show inline comments

		from __future__ import unicode_literals
		from django.apps import AppConfig

symposion/schedule/forms.py

➞

Show inline comments

		from __future__ import unicode_literals
		import csv

symposion/schedule/helpers.py

➞

Show inline comments

@@ ... / @@ -4,2 +4,3 @@ manipulating the database in more natural ways. @@
 """
 from __future__ import unicode_literals
 from django.db import transaction

symposion/schedule/models.py

➞

Show inline comments

 from __future__ import unicode_literals
 import datetime
@@ ... / @@ -5,2 +6,3 @@ from django.contrib.auth.models import User @@
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
@@ ... / @@ -13,2 +15,3 @@ from symposion.speakers.models import Speaker @@
 @python_2_unicode_compatible
 class Schedule(models.Model):
@@ ... / @@ -19,4 +22,4 @@ class Schedule(models.Model): @@
     def __unicode__(self):
         return u"%s Schedule" % self.section
     def __str__(self):
         return "%s Schedule" % self.section
@@ ... / @@ -26,2 +29,3 @@ class Schedule(models.Model): @@
 @python_2_unicode_compatible
 class Day(models.Model):
@@ ... / @@ -31,4 +35,4 @@ class Day(models.Model): @@
     def __unicode__(self):
         return u"%s" % self.date
     def __str__(self):
         return "%s" % self.date
@@ ... / @@ -39,2 +43,3 @@ class Day(models.Model): @@
 @python_2_unicode_compatible
 class Room(models.Model):
@@ ... / @@ -45,3 +50,3 @@ class Room(models.Model): @@
-    def __unicode__(self):
+    def __str__(self):
         return self.name
@@ ... / @@ -49,2 +54,3 @@ class Room(models.Model): @@
 @python_2_unicode_compatible
 class SlotKind(models.Model):
@@ ... / @@ -58,3 +64,3 @@ class SlotKind(models.Model): @@
-    def __unicode__(self):
+    def __str__(self):
         return self.label
@@ ... / @@ -62,2 +68,3 @@ class SlotKind(models.Model): @@
 @python_2_unicode_compatible
 class Slot(models.Model):
@@ ... / @@ -126,5 +133,5 @@ class Slot(models.Model): @@
-    def __unicode__(self):
+    def __str__(self):
         roomlist = ' '.join(map(lambda r: r.__unicode__(), self.rooms))
-        return u"%s %s (%s - %s) %s" % (self.day, self.kind, self.start, self.end, roomlist)
         return "%s %s (%s - %s) %s" % (self.day, self.kind, self.start, self.end, roomlist)
@@ ... / @@ -134,2 +141,3 @@ class Slot(models.Model): @@
 @python_2_unicode_compatible
 class SlotRoom(models.Model):
@@ ... / @@ -142,4 +150,4 @@ class SlotRoom(models.Model): @@
     def __unicode__(self):
         return u"%s %s" % (self.room, self.slot)
     def __str__(self):
         return "%s %s" % (self.room, self.slot)
@@ ... / @@ -150,2 +158,3 @@ class SlotRoom(models.Model): @@
 @python_2_unicode_compatible
 class Presentation(models.Model):
@@ ... / @@ -179,4 +188,4 @@ class Presentation(models.Model): @@
     def __unicode__(self):
         return u"#%s %s (%s)" % (self.number, self.title, self.speaker)
     def __str__(self):
         return "#%s %s (%s)" % (self.number, self.title, self.speaker)
@@ ... / @@ -186,2 +195,3 @@ class Presentation(models.Model): @@
 @python_2_unicode_compatible
 class Session(models.Model):
@@ ... / @@ -208,3 +218,3 @@ class Session(models.Model): @@
-    def __unicode__(self):
+    def __str__(self):
         start = self.start()
@@ ... / @@ -212,3 +222,3 @@ class Session(models.Model): @@
         if start and end:
-            return u"%s: %s - %s" % (
             return "%s: %s - %s" % (
                 self.day.date.strftime("%a"),
@@ ... / @@ -217,5 +227,6 @@ class Session(models.Model): @@
+            )
-        return u""
         return ""
 @python_2_unicode_compatible
 class SessionRole(models.Model):
@@ ... / @@ -240,4 +251,4 @@ class SessionRole(models.Model): @@
     def __unicode__(self):
         return u"%s %s: %s" % (self.user, self.session,
                                self.SESSION_ROLE_TYPES[self.role - 1][1])
     def __str__(self):
         return "%s %s: %s" % (self.user, self.session,
                               self.SESSION_ROLE_TYPES[self.role - 1][1])

symposion/schedule/timetable.py

➞

Show inline comments

		from __future__ import unicode_literals
		import itertools

symposion/schedule/urls.py

➞

Show inline comments

		from __future__ import unicode_literals
		from django.conf.urls import url, patterns

symposion/schedule/views.py

➞

Show inline comments

		from __future__ import unicode_literals
		import json

symposion/speakers/admin.py

➞

Show inline comments

		from __future__ import unicode_literals
		from django.contrib import admin

symposion/speakers/apps.py

➞

Show inline comments

		from __future__ import unicode_literals
		from django.apps import AppConfig

symposion/speakers/forms.py

➞

Show inline comments

		from __future__ import unicode_literals
		from django import forms

symposion/speakers/models.py

➞

Show inline comments

 from __future__ import unicode_literals
 import datetime
 from django.utils.encoding import python_2_unicode_compatible
@@ ... / @@ -10,2 +12,3 @@ from markitup.fields import MarkupField @@
 @python_2_unicode_compatible
 class Speaker(models.Model):
@@ ... / @@ -36,3 +39,3 @@ class Speaker(models.Model): @@
-    def __unicode__(self):
+    def __str__(self):
         if self.user:
@@ ... / @@ -40,3 +43,3 @@ class Speaker(models.Model): @@
         else:
-            return u"?"
             return "?"

symposion/speakers/urls.py

➞

Show inline comments

		from __future__ import unicode_literals
		from django.conf.urls import patterns, url

symposion/speakers/views.py

➞

Show inline comments

		from __future__ import unicode_literals
		from django.core.exceptions import ObjectDoesNotExist

symposion/sponsorship/admin.py

➞

Show inline comments

		from __future__ import unicode_literals
		from django.contrib import admin

symposion/sponsorship/forms.py

➞

Show inline comments

		from __future__ import unicode_literals
		from django import forms

symposion/sponsorship/models.py

➞

Show inline comments

 from __future__ import unicode_literals
 import datetime
@@ ... / @@ -7,2 +8,3 @@ 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 _
@@ ... / @@ -16,2 +18,3 @@ from symposion.sponsorship.managers import SponsorManager @@
 @python_2_unicode_compatible
 class SponsorLevel(models.Model):
@@ ... / @@ -29,3 +32,3 @@ class SponsorLevel(models.Model): @@
-    def __unicode__(self):
+    def __str__(self):
         return self.name
@@ ... / @@ -36,2 +39,3 @@ class SponsorLevel(models.Model): @@
 @python_2_unicode_compatible
 class Sponsor(models.Model):
@@ ... / @@ -57,3 +61,3 @@ class Sponsor(models.Model): @@
-    def __unicode__(self):
+    def __str__(self):
         return self.name
@@ ... / @@ -168,2 +172,3 @@ CONTENT_TYPE_CHOICES = [ @@
 @python_2_unicode_compatible
 class Benefit(models.Model):
@@ ... / @@ -177,3 +182,3 @@ class Benefit(models.Model): @@
-    def __unicode__(self):
+    def __str__(self):
         return self.name
@@ ... / @@ -181,2 +186,3 @@ class Benefit(models.Model): @@
 @python_2_unicode_compatible
 class BenefitLevel(models.Model):
@@ ... / @@ -193,6 +199,7 @@ class BenefitLevel(models.Model): @@
     def __unicode__(self):
         return u"%s - %s" % (self.level, self.benefit)
     def __str__(self):
         return "%s - %s" % (self.level, self.benefit)
 @python_2_unicode_compatible
 class SponsorBenefit(models.Model):
@@ ... / @@ -215,4 +222,4 @@ class SponsorBenefit(models.Model): @@
     def __unicode__(self):
         return u"%s - %s" % (self.sponsor, self.benefit)
     def __str__(self):
         return "%s - %s" % (self.sponsor, self.benefit)

symposion/sponsorship/views.py

➞

Show inline comments

		from __future__ import unicode_literals
		from cStringIO import StringIO

symposion/teams/forms.py

➞

Show inline comments

		from __future__ import unicode_literals
		from django import forms

symposion/teams/models.py

➞

Show inline comments

 from __future__ import unicode_literals
 import datetime
@@ ... / @@ -7,2 +8,3 @@ import reversion @@
 from django.contrib.auth.models import Permission, User
 from django.utils.encoding import python_2_unicode_compatible
@@ ... / @@ -16,2 +18,3 @@ TEAM_ACCESS_CHOICES = [ @@
 @python_2_unicode_compatible
 class Team(models.Model):
@@ ... / @@ -36,3 +39,3 @@ class Team(models.Model): @@
-    def __unicode__(self):
+    def __str__(self):
         return self.name

symposion/teams/views.py

➞

Show inline comments

		from __future__ import unicode_literals
		from django.http import Http404, HttpResponseNotAllowed

symposion/views.py

➞

Show inline comments

		from __future__ import unicode_literals
		import hashlib

0 comments (0 inline, 0 general)