Removed some Py2 compatibility decorators.

 - Legacy-Id: 17673

Author: levkowetz

.gitignore

@@ -44,10 +44,11 @@
 /share
 /static
 /testresult
+/tmp
+/tmp-nomcom-public-keys-dir
 /trunk27
 /trunk36
 /trunk37
 /unix.tag
-/tmp-nomcom-public-keys-dir
 *.pyc
 __pycache__

env/.gitignore

@@ -1,10 +1,12 @@
+/.Python
 /bin
-/share
-/selenium
 /etc
-/local
-/lib
 /include
-/pip-selfcheck.json
-/.Python
+/lib
+/lib64
+/local
 /man
+/pip-selfcheck.json
+/pyvenv.cfg
+/selenium
+/share

ietf/community/models.py

@@ -6,14 +6,12 @@
 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)
@@ -39,7 +37,6 @@ 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
@@ -85,7 +82,6 @@ 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

@@ -5,7 +5,6 @@
 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,7 +18,6 @@
     )
 
 
-@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/doc/models.py

@@ -16,7 +16,7 @@
 from django.urls import reverse as urlreverse
 from django.contrib.contenttypes.models import ContentType
 from django.conf import settings
-from django.utils.encoding import python_2_unicode_compatible, force_text
+from django.utils.encoding import force_text
 from django.utils.html import mark_safe # type:ignore
 
 import debug                            # pyflakes:ignore
@@ -36,7 +36,6 @@
 
 logger = logging.getLogger('django')
 
-@python_2_unicode_compatible
 class StateType(models.Model):
     slug = models.CharField(primary_key=True, max_length=30) # draft, draft-iesg, charter, ...
     label = models.CharField(max_length=255, help_text="Label that should be used (e.g. in admin) for state drop-down for this type of state") # State, IESG state, WG state, ...
@@ -58,7 +57,6 @@ def check_statetype_slugs(app_configs, **kwargs):
             ))
     return errors
 
-@python_2_unicode_compatible
 class State(models.Model):
     type = ForeignKey(StateType)
     slug = models.SlugField()
@@ -543,7 +541,6 @@ class Meta:
 
 STATUSCHANGE_RELATIONS = ('tops','tois','tohist','toinf','tobcp','toexp')
 
-@python_2_unicode_compatible
 class RelatedDocument(models.Model):
     source = ForeignKey('Document')
     target = ForeignKey('DocAlias')
@@ -617,7 +614,6 @@ class Meta:
         abstract = True
         ordering = ["document", "order"]
 
-@python_2_unicode_compatible
 class DocumentAuthor(DocumentAuthorInfo):
     document = ForeignKey('Document')
 
@@ -631,7 +627,6 @@ def __str__(self):
     'invalid'
 )
 
-@python_2_unicode_compatible
 class Document(DocumentInfo):
     name = models.CharField(max_length=255, validators=[validate_docname,], unique=True)           # immutable
 
@@ -866,15 +861,13 @@ class DocumentURL(models.Model):
     desc = models.CharField(max_length=255, default='', blank=True)
     url  = models.URLField(max_length=2083) # 2083 is the legal max for URLs
 
-@python_2_unicode_compatible
 class RelatedDocHistory(models.Model):
     source = ForeignKey('DocHistory')
     target = ForeignKey('DocAlias', related_name="reversely_related_document_history_set")
     relationship = ForeignKey(DocRelationshipName)
     def __str__(self):
         return u"%s %s %s" % (self.source.doc.name, self.relationship.name.lower(), self.target.name)
 
-@python_2_unicode_compatible
 class DocHistoryAuthor(DocumentAuthorInfo):
     # use same naming convention as non-history version to make it a bit
     # easier to write generic code
@@ -883,7 +876,6 @@ class DocHistoryAuthor(DocumentAuthorInfo):
     def __str__(self):
         return u"%s %s (%s)" % (self.document.doc.name, self.person, self.order)
 
-@python_2_unicode_compatible
 class DocHistory(DocumentInfo):
     doc = ForeignKey(Document, related_name="history_set")
     # the name here is used to capture the canonical name at the time
@@ -934,7 +926,6 @@ class Meta:
         verbose_name = "document history"
         verbose_name_plural = "document histories"
 
-@python_2_unicode_compatible
 class DocAlias(models.Model):
     """This is used for documents that may appear under multiple names,
     and in particular for RFCs, which for continuity still keep the
@@ -1042,7 +1033,6 @@ class DocReminder(models.Model):
     ("removed_related_ipr", "Removed related IPR"),
     ]
 
-@python_2_unicode_compatible
 class DocEvent(models.Model):
     """An occurrence for a document, used for tracking who, when and what."""
     time = models.DateTimeField(default=datetime.datetime.now, help_text="When the event happened", db_index=True)
@@ -1086,7 +1076,6 @@ class ConsensusDocEvent(DocEvent):
     consensus = models.NullBooleanField(default=None)
 
 # IESG events
-@python_2_unicode_compatible
 class BallotType(models.Model):
     doc_type = ForeignKey(DocTypeName, blank=True, null=True)
     slug = models.SlugField()
@@ -1221,7 +1210,6 @@ class SubmissionDocEvent(DocEvent):
     submission = ForeignKey(ietf.submit.models.Submission)
 
 # dumping store for removed events
-@python_2_unicode_compatible
 class DeletedEvent(models.Model):
     content_type = ForeignKey(ContentType)
     json = models.TextField(help_text="Deleted object in JSON format, with attribute names chosen to be suitable for passing into the relevant create method.")

ietf/group/models.py

@@ -15,7 +15,6 @@
 from django.db import models
 from django.db.models.deletion import CASCADE
 from django.dispatch import receiver
-from django.utils.encoding import python_2_unicode_compatible
 
 from simple_history.models import HistoricalRecords
 
@@ -29,7 +28,6 @@
 from ietf.utils.models import ForeignKey, OneToOneField
 
 
-@python_2_unicode_compatible
 class GroupInfo(models.Model):
     time = models.DateTimeField(default=datetime.datetime.now)
     name = models.CharField(max_length=80)
@@ -252,7 +250,6 @@ class GroupHistory(GroupInfo):
     class Meta:
         verbose_name_plural="group histories"
 
-@python_2_unicode_compatible
 class GroupURL(models.Model):
     group = ForeignKey(Group)
     name = models.CharField(max_length=255)
@@ -261,7 +258,6 @@ class GroupURL(models.Model):
     def __str__(self):
         return u"%s (%s)" % (self.url, self.name)
 
-@python_2_unicode_compatible
 class GroupMilestoneInfo(models.Model):
     group = ForeignKey(Group)
     # a group has two sets of milestones, current milestones
@@ -289,7 +285,6 @@ class GroupMilestoneHistory(GroupMilestoneInfo):
     time = models.DateTimeField()
     milestone = ForeignKey(GroupMilestone, related_name="history_set")
 
-@python_2_unicode_compatible
 class GroupStateTransitions(models.Model):
     """Captures that a group has overriden the default available
     document state transitions for a certain state."""
@@ -310,7 +305,6 @@ def __str__(self):
     ("status_update", "Status update"),
     ]
 
-@python_2_unicode_compatible
 class GroupEvent(models.Model):
     """An occurrence for a group, used for tracking who, when and what."""
     group = ForeignKey(Group)
@@ -331,7 +325,6 @@ class ChangeStateGroupEvent(GroupEvent):
 class MilestoneGroupEvent(GroupEvent):
     milestone = ForeignKey(GroupMilestone)
 
-@python_2_unicode_compatible
 class Role(models.Model):
     name = ForeignKey(RoleName)
     group = ForeignKey(Group)
@@ -349,7 +342,6 @@ def formatted_email(self):
     class Meta:
         ordering = ['name_id', ]
 
-@python_2_unicode_compatible
 class RoleHistory(models.Model):
     # RoleHistory doesn't have a time field as it's not supposed to be
     # used on its own - there should always be a GroupHistory

ietf/iesg/models.py

@@ -37,9 +37,7 @@
 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.)"),
@@ -80,7 +78,6 @@ 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

@@ -7,15 +7,13 @@
 from django.conf import settings
 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, DocEvent
 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)
@@ -158,7 +156,6 @@ 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)
@@ -189,7 +186,6 @@ 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')
@@ -198,7 +194,6 @@ 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

@@ -5,7 +5,6 @@
 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
@@ -27,7 +26,6 @@
 }
 
 
-@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')
@@ -201,7 +199,6 @@ 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)
@@ -211,7 +208,6 @@ 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')
@@ -221,7 +217,6 @@ 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)
@@ -231,7 +226,6 @@ 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

@@ -5,12 +5,10 @@
 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)
@@ -21,7 +19,6 @@ def __str__(self):
     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=128, validators=[validate_email])
@@ -31,7 +28,6 @@ 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])