Python2/3 compatibility: used @python_2_unicode_compatible to provide __unicode__() versions of __str__() methods.

 - Legacy-Id: 16455

Author: levkowetz

docker/install-extras

@@ -5,3 +5,4 @@ su - -c "apt-get update \
 	&& apt-get install -qy graphviz ghostscript apache2-utils \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/*"
+      

ietf/community/models.py

@@ -1,14 +1,21 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.contrib.auth.models import User
 from django.db import models
 from django.db.models import signals
 from django.urls import reverse as urlreverse
+from django.utils.encoding import python_2_unicode_compatible
 
 from ietf.doc.models import Document, DocEvent, State
 from ietf.group.models import Group
 from ietf.person.models import Person, Email
 from ietf.utils.models import ForeignKey
 
+@python_2_unicode_compatible
 class CommunityList(models.Model):
     user = ForeignKey(User, blank=True, null=True)
     group = ForeignKey(Group, blank=True, null=True)
@@ -34,6 +41,7 @@ def get_absolute_url(self):
         return ""
 
 
+@python_2_unicode_compatible
 class SearchRule(models.Model):
     # these types define the UI for setting up the rule, and also
     # helps when interpreting the rule and matching documents
@@ -79,6 +87,7 @@ class SearchRule(models.Model):
     def __str__(self):
         return "%s %s %s/%s/%s/%s" % (self.community_list, self.rule_type, self.state, self.group, self.person, self.text)
 
+@python_2_unicode_compatible
 class EmailSubscription(models.Model):
     community_list = ForeignKey(CommunityList)
     email = ForeignKey(Email)

ietf/dbtemplate/models.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
-
-
+from __future__ import absolute_import, print_function, unicode_literals
 
 from django.db import models
 from django.core.exceptions import ValidationError
 from django.template import Context
+from django.utils.encoding import python_2_unicode_compatible
 
 from ietf.group.models import Group
 from ietf.name.models import DBTemplateTypeName
@@ -19,6 +19,7 @@
     )
 
 
+@python_2_unicode_compatible
 class DBTemplate(models.Model):
     path = models.CharField( max_length=255, unique=True, blank=False, null=False, )
     title = models.CharField( max_length=255, blank=False, null=False, )

ietf/iesg/models.py

@@ -1,5 +1,6 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
-
+# -*- coding: utf-8 -*-
+#
 # Portion Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
 # 
@@ -32,11 +33,15 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
-
+@python_2_unicode_compatible
 class TelechatAgendaItem(models.Model):
     TYPE_CHOICES = (
         (1, "Any Other Business (WG News, New Proposals, etc.)"),
@@ -51,7 +56,7 @@ class TelechatAgendaItem(models.Model):
 
     def __str__(self):
         type_name = self.TYPE_CHOICES_DICT.get(self.type, str(self.type))
-        return '%s: %s' % (type_name, self.title or "")
+        return "%s: %s" % (type_name, self.title or "")
 
 class Telechat(models.Model):
     telechat_id = models.IntegerField(primary_key=True)
@@ -77,6 +82,7 @@ class TelechatDateManager(models.Manager):
     def active(self):
         return self.get_queryset().filter(date__gte=datetime.date.today())
 
+@python_2_unicode_compatible
 class TelechatDate(models.Model):
     objects = TelechatDateManager()
 

ietf/ipr/models.py

@@ -1,17 +1,23 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
 
 from django.conf import settings
-from django.urls import reverse
 from django.db import models
+from django.urls import reverse
+from django.utils.encoding import python_2_unicode_compatible
 
 from ietf.doc.models import DocAlias
 from ietf.name.models import DocRelationshipName,IprDisclosureStateName,IprLicenseTypeName,IprEventTypeName
 from ietf.person.models import Person
 from ietf.message.models import Message
 from ietf.utils.models import ForeignKey
 
+@python_2_unicode_compatible
 class IprDisclosureBase(models.Model):
     by                  = ForeignKey(Person) # who was logged in, or System if nobody was logged in
     compliant           = models.BooleanField("Complies to RFC3979", default=True)
@@ -148,6 +154,7 @@ class GenericIprDisclosure(IprDisclosureBase):
     holder_contact_info      = models.TextField(blank=True, help_text="Address, phone, etc.")
     statement                = models.TextField() # includes licensing info
 
+@python_2_unicode_compatible
 class IprDocRel(models.Model):
     disclosure = ForeignKey(IprDisclosureBase)
     document   = ForeignKey(DocAlias)
@@ -178,6 +185,7 @@ def __str__(self):
         else:
             return "%s which applies to %s" % (self.disclosure, self.document.name)
 
+@python_2_unicode_compatible
 class RelatedIpr(models.Model):
     source       = ForeignKey(IprDisclosureBase,related_name='relatedipr_source_set')
     target       = ForeignKey(IprDisclosureBase,related_name='relatedipr_target_set')
@@ -186,6 +194,7 @@ class RelatedIpr(models.Model):
     def __str__(self):
         return "%s %s %s" % (self.source.title, self.relationship.name.lower(), self.target.title)
 
+@python_2_unicode_compatible
 class IprEvent(models.Model):
     time        = models.DateTimeField(auto_now_add=True)
     type        = ForeignKey(IprEventTypeName)

ietf/liaisons/models.py

@@ -1,8 +1,13 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 from django.conf import settings
 from django.urls import reverse as urlreverse
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.text import slugify
 
 from ietf.person.models import Email, Person
@@ -24,6 +29,7 @@
 }
 
 
+@python_2_unicode_compatible
 class LiaisonStatement(models.Model):
     title = models.CharField(max_length=255)
     from_groups = models.ManyToManyField(Group, blank=True, related_name='liaisonstatement_from_set')
@@ -47,7 +53,6 @@ class LiaisonStatement(models.Model):
 
     class Meta:
         ordering = ['id']
-        
 
     def __str__(self):
         return self.title or "<no title>"
@@ -198,6 +203,7 @@ def approver_emails(self):
                 approval_set.intersection_update(group.liaison_approvers())
         return list(set([ r.email.address for r in approval_set ]))
 
+@python_2_unicode_compatible
 class LiaisonStatementAttachment(models.Model):
     statement = ForeignKey(LiaisonStatement)
     document = ForeignKey(Document)
@@ -207,6 +213,7 @@ def __str__(self):
         return self.document.name
 
 
+@python_2_unicode_compatible
 class RelatedLiaisonStatement(models.Model):
     source = ForeignKey(LiaisonStatement, related_name='source_of_set')
     target = ForeignKey(LiaisonStatement, related_name='target_of_set')
@@ -216,6 +223,7 @@ def __str__(self):
         return "%s %s %s" % (self.source.title, self.relationship.name.lower(), self.target.title)
 
 
+@python_2_unicode_compatible
 class LiaisonStatementGroupContacts(models.Model):
     group = ForeignKey(Group, unique=True, null=True)
     contacts = models.CharField(max_length=255,blank=True)
@@ -225,6 +233,7 @@ def __str__(self):
         return "%s" % self.group.name
 
 
+@python_2_unicode_compatible
 class LiaisonStatementEvent(models.Model):
     time = models.DateTimeField(auto_now_add=True)
     type = ForeignKey(LiaisonStatementEventTypeName)

ietf/mailinglists/models.py

@@ -1,22 +1,29 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.conf import settings
 from django.core.validators import validate_email
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
 from ietf.person.models import Person
 from ietf.utils.models import ForeignKey
 
+@python_2_unicode_compatible
 class List(models.Model):
     name = models.CharField(max_length=32)
     description = models.CharField(max_length=256)
     advertised = models.BooleanField(default=True)
+
     def __str__(self):
         return "<List: %s>" % self.name
     def info_url(self):
         return settings.MAILING_LIST_INFO_URL % {'list_addr': self.name }
 
+@python_2_unicode_compatible
 class Subscribed(models.Model):
     time = models.DateTimeField(auto_now_add=True)
     email = models.CharField(max_length=64, validators=[validate_email])
@@ -26,6 +33,7 @@ def __str__(self):
     class Meta:
         verbose_name_plural = "Subscribed"
 
+@python_2_unicode_compatible
 class Whitelisted(models.Model):
     time = models.DateTimeField(auto_now_add=True)
     email = models.CharField("Email address", max_length=64, validators=[validate_email])

ietf/mailtrigger/models.py

@@ -1,7 +1,12 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 from django.db import models
 from django.template import Template, Context
+from django.utils.encoding import python_2_unicode_compatible
 
 from email.utils import parseaddr
 from ietf.utils.mail import formataddr, get_email_addresses_from_text
@@ -28,6 +33,7 @@ def clean_duplicates(addrlist):
             addresses.append(addr)
     return addresses
 
+@python_2_unicode_compatible
 class MailTrigger(models.Model):
     slug = models.CharField(max_length=32, primary_key=True)
     desc = models.TextField(blank=True)
@@ -40,6 +46,7 @@ class Meta:
     def __str__(self):
         return self.slug
 
+@python_2_unicode_compatible
 class Recipient(models.Model):
     slug = models.CharField(max_length=32, primary_key=True)
     desc = models.TextField(blank=True)

ietf/message/models.py

@@ -1,8 +1,14 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import email.utils
 
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
 import debug                            # pyflakes:ignore
 
@@ -13,6 +19,7 @@
 from ietf.utils.models import ForeignKey
 from ietf.utils.mail import get_email_addresses_from_text
 
+@python_2_unicode_compatible
 class Message(models.Model):
     time = models.DateTimeField(default=datetime.datetime.now)
     by = ForeignKey(Person)
@@ -41,6 +48,7 @@ def get(self, field):
         return r if isinstance(r, list) else get_email_addresses_from_text(r)
 
 
+@python_2_unicode_compatible
 class MessageAttachment(models.Model):
     message = ForeignKey(Message)
     filename = models.CharField(max_length=255, db_index=True, blank=True)
@@ -53,6 +61,7 @@ def __str__(self):
         return self.filename
 
 
+@python_2_unicode_compatible
 class SendQueue(models.Model):
     time = models.DateTimeField(default=datetime.datetime.now)
     by = ForeignKey(Person)
@@ -71,6 +80,7 @@ def __str__(self):
         return "'%s' %s -> %s (sent at %s)" % (self.message.subject, self.message.frm, self.message.to, self.sent_at or "<not yet>")
 
 
+@python_2_unicode_compatible
 class AnnouncementFrom(models.Model):
     name = ForeignKey(RoleName)
     group = ForeignKey(Group)

ietf/name/models.py

@@ -1,9 +1,15 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
 from ietf.utils.models import ForeignKey
 
+@python_2_unicode_compatible
 class NameModel(models.Model):
     slug = models.CharField(max_length=32, primary_key=True)
     name = models.CharField(max_length=255)