symposion_app Changeset - 039ce4e00034

Changeset - 039ce4e00034

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Hiroshi Miura - 9 years ago 2015-05-24 23:35:55
miurahr@linux.com

Return unicode from _unicode_ methods

Import from PyCon improvement.

Author: Dan Poirier <dpoirier@caktusgroup.com>
Date: Mon Jul 8 15:55:33 2013 -0400

Return unicode from __unicode__ methods

Signed-off-by: Hiroshi Miura <miurahr@linux.com>

3 files changed with 7 insertions and 7 deletions:

symposion/conference/models.py

symposion/schedule/models.py

symposion/speakers/models.py

0 comments (0 inline, 0 general)

symposion/conference/models.py

➞

Show inline comments

@@ ... / @@ -50,25 +50,25 @@ class Section(models.Model): @@
     """
     conference = models.ForeignKey(Conference, verbose_name=_("conference"))
     name = models.CharField(_("name"), max_length=100)
     slug = models.SlugField()
     # when the section runs
     start_date = models.DateField(_("start date"), null=True, blank=True)
     end_date = models.DateField(_("end date"), null=True, blank=True)
     def __unicode__(self):
         return "%s %s" % (self.conference, self.name)
+        return u"%s %s" % (self.conference, self.name)
     class Meta(object):
         verbose_name = _("section")
         verbose_name_plural = _("sections")
         ordering = ["start_date"]
 def current_conference():
     from django.conf import settings
     try:
         conf_id = settings.CONFERENCE_ID
     except AttributeError:

symposion/schedule/models.py

➞

Show inline comments

@@ ... / @@ -8,37 +8,37 @@ from markitup.fields import MarkupField @@
 from symposion.proposals.models import ProposalBase
 from symposion.conference.models import Section
 from symposion.speakers.models import Speaker
 class Schedule(models.Model):
     section = models.OneToOneField(Section)
     published = models.BooleanField(default=True)
     hidden = models.BooleanField("Hide schedule from overall conference view", default=False)
     def __unicode__(self):
         return "%s Schedule" % self.section
+        return u"%s Schedule" % self.section
     class Meta:
         ordering = ["section"]
 class Day(models.Model):
     schedule = models.ForeignKey(Schedule)
     date = models.DateField()
     def __unicode__(self):
         return "%s" % self.date
+        return u"%s" % self.date
     class Meta:
         unique_together = [("schedule", "date")]
         ordering = ["date"]
 class Room(models.Model):
     schedule = models.ForeignKey(Schedule)
     name = models.CharField(max_length=65)
     order = models.PositiveIntegerField()
@@ ... / @@ -115,40 +115,40 @@ class Slot(models.Model): @@
             self.end.minute)
     @property
     def length_in_minutes(self):
         return int(
             (self.end_datetime - self.start_datetime).total_seconds() / 60)
     @property
     def rooms(self):
         return Room.objects.filter(pk__in=self.slotroom_set.values("room"))
     def __unicode__(self):
         return "%s %s (%s - %s)" % (self.day, self.kind, self.start, self.end)
+        return u"%s %s (%s - %s)" % (self.day, self.kind, self.start, self.end)
     class Meta:
         ordering = ["day", "start", "end"]
 class SlotRoom(models.Model):
     """
     Links a slot with a room.
     """
     slot = models.ForeignKey(Slot)
     room = models.ForeignKey(Room)
     def __unicode__(self):
         return "%s %s" % (self.room, self.slot)
+        return u"%s %s" % (self.room, self.slot)
     class Meta:
         unique_together = [("slot", "room")]
         ordering = ["slot", "room__order"]
 class Presentation(models.Model):
     slot = models.OneToOneField(Slot, null=True, blank=True, related_name="content_ptr")
     title = models.CharField(max_length=100)
     description = MarkupField()
     abstract = MarkupField()
@@ ... / @@ -167,16 +167,16 @@ class Presentation(models.Model): @@
     def proposal(self):
         if self.proposal_base_id is None:
             return None
         return ProposalBase.objects.get_subclass(pk=self.proposal_base_id)
     def speakers(self):
         yield self.speaker
         for speaker in self.additional_speakers.all():
             if speaker.user:
                 yield speaker
     def __unicode__(self):
         return "#%s %s (%s)" % (self.number, self.title, self.speaker)
+        return u"#%s %s (%s)" % (self.number, self.title, self.speaker)
     class Meta:
         ordering = ["slot"]

symposion/speakers/models.py

➞

Show inline comments

@@ ... / @@ -29,25 +29,25 @@ class Speaker(models.Model): @@
     created = models.DateTimeField(
         default=datetime.datetime.now,
         editable=False
+    )
     class Meta:
         ordering = ['name']
     def __unicode__(self):
         if self.user:
             return self.name
         else:
             return "?"
+            return u"?"
     def get_absolute_url(self):
         return reverse("speaker_edit")
     @property
     def email(self):
         if self.user is not None:
             return self.user.email
         else:
             return self.invite_email
     @property

0 comments (0 inline, 0 general)