Skip to content

Commit 484dcec

Browse files
levkowetzlevkowetz
committed
Changed all model __unicode__() methods to __str__()
 - Legacy-Id: 16330
1 parent ea109f2 commit 484dcec

File tree

18 files changed

+88
-87
lines changed

18 files changed

+88
-87
lines changed

‎ietf/community/models.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def long_name(self):
2222
else:
2323
return 'ID list'
2424

25-
def __unicode__(self):
25+
def __str__(self):
2626
return self.long_name()
2727

2828
def get_absolute_url(self):
@@ -76,7 +76,7 @@ class SearchRule(models.Model):
7676
# when new documents are submitted
7777
name_contains_index = models.ManyToManyField(Document)
7878

79-
def __unicode__(self):
79+
def __str__(self):
8080
return "%s %s %s/%s/%s/%s" % (self.community_list, self.rule_type, self.state, self.group, self.person, self.text)
8181

8282
class EmailSubscription(models.Model):
@@ -89,7 +89,7 @@ class EmailSubscription(models.Model):
8989
]
9090
notify_on = models.CharField(max_length=30, choices=NOTIFICATION_CHOICES, default="all")
9191

92-
def __unicode__(self):
92+
def __str__(self):
9393
return "%s to %s (%s changes)" % (self.email, self.community_list, self.notify_on)
9494

9595

‎ietf/dbtemplate/models.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class DBTemplate(models.Model):
2727
content = models.TextField( blank=False, null=False, )
2828
group = ForeignKey( Group, blank=True, null=True, )
2929

30-
def __unicode__(self):
30+
def __str__(self):
3131
return self.title
3232

3333
def clean(self):

‎ietf/doc/models.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class StateType(models.Model):
3838
slug = models.CharField(primary_key=True, max_length=30) # draft, draft-iesg, charter, ...
3939
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, ...
4040

41-
def __unicode__(self):
41+
def __str__(self):
4242
return self.slug
4343

4444
@checks.register('db-consistency')
@@ -65,7 +65,7 @@ class State(models.Model):
6565

6666
next_states = models.ManyToManyField('State', related_name="previous_states", blank=True)
6767

68-
def __unicode__(self):
68+
def __str__(self):
6969
return self.name
7070

7171
class Meta:
@@ -530,7 +530,7 @@ class RelatedDocument(models.Model):
530530
relationship = ForeignKey(DocRelationshipName)
531531
def action(self):
532532
return self.relationship.name
533-
def __unicode__(self):
533+
def __str__(self):
534534
return "%s %s %s" % (self.source.name, self.relationship.name.lower(), self.target.name)
535535

536536
def is_downref(self):
@@ -600,7 +600,7 @@ class Meta:
600600
class DocumentAuthor(DocumentAuthorInfo):
601601
document = ForeignKey('Document')
602602

603-
def __unicode__(self):
603+
def __str__(self):
604604
return "%s %s (%s)" % (self.document.name, self.person, self.order)
605605

606606

@@ -613,7 +613,7 @@ def __unicode__(self):
613613
class Document(DocumentInfo):
614614
name = models.CharField(max_length=255, validators=[validate_docname,], unique=True) # immutable
615615

616-
def __unicode__(self):
616+
def __str__(self):
617617
return self.name
618618

619619
def get_absolute_url(self):
@@ -849,15 +849,15 @@ class RelatedDocHistory(models.Model):
849849
source = ForeignKey('DocHistory')
850850
target = ForeignKey('DocAlias', related_name="reversely_related_document_history_set")
851851
relationship = ForeignKey(DocRelationshipName)
852-
def __unicode__(self):
852+
def __str__(self):
853853
return "%s %s %s" % (self.source.doc.name, self.relationship.name.lower(), self.target.name)
854854

855855
class DocHistoryAuthor(DocumentAuthorInfo):
856856
# use same naming convention as non-history version to make it a bit
857857
# easier to write generic code
858858
document = ForeignKey('DocHistory', related_name="documentauthor_set")
859859

860-
def __unicode__(self):
860+
def __str__(self):
861861
return "%s %s (%s)" % (self.document.doc.name, self.person, self.order)
862862

863863
class DocHistory(DocumentInfo):
@@ -868,7 +868,7 @@ class DocHistory(DocumentInfo):
868868
# property
869869
name = models.CharField(max_length=255)
870870

871-
def __unicode__(self):
871+
def __str__(self):
872872
return str(self.doc.name)
873873

874874
def canonical_name(self):
@@ -917,7 +917,7 @@ class DocAlias(models.Model):
917917
def document(self):
918918
return self.docs.first()
919919

920-
def __unicode__(self):
920+
def __str__(self):
921921
return "%s-->%s" % (self.name, ','.join([str(d.name) for d in self.docs.all() if isinstance(d, Document) ]))
922922
document_link = admin_link("document")
923923
class Meta:
@@ -1023,7 +1023,7 @@ def for_current_revision(self):
10231023
def get_dochistory(self):
10241024
return DocHistory.objects.filter(time__lte=self.time,doc__name=self.doc.name).order_by('-time', '-pk').first()
10251025

1026-
def __unicode__(self):
1026+
def __str__(self):
10271027
return "%s %s by %s at %s" % (self.doc.name, self.get_type_display().lower(), self.by.plain_name(), self.time)
10281028

10291029
def save(self, *args, **kwargs):
@@ -1056,7 +1056,7 @@ class BallotType(models.Model):
10561056
order = models.IntegerField(default=0)
10571057
positions = models.ManyToManyField(BallotPositionName, blank=True)
10581058

1059-
def __unicode__(self):
1059+
def __str__(self):
10601060
return "%s: %s" % (self.name, self.doc_type.name)
10611061

10621062
class Meta:
@@ -1183,7 +1183,7 @@ class DeletedEvent(models.Model):
11831183
by = ForeignKey(Person)
11841184
time = models.DateTimeField(default=datetime.datetime.now)
11851185

1186-
def __unicode__(self):
1186+
def __str__(self):
11871187
return "%s by %s %s" % (self.content_type, self.by, self.time)
11881188

11891189
class EditedAuthorsDocEvent(DocEvent):

‎ietf/group/models.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class GroupInfo(models.Model):
4242
unused_states = models.ManyToManyField('doc.State', help_text="Document states that have been disabled for the group.", blank=True)
4343
unused_tags = models.ManyToManyField(DocTagName, help_text="Document tags that have been disabled for the group.", blank=True)
4444

45-
def __unicode__(self):
45+
def __str__(self):
4646
return self.name
4747

4848
def ad_role(self):
@@ -252,7 +252,7 @@ class GroupURL(models.Model):
252252
name = models.CharField(max_length=255)
253253
url = models.URLField()
254254

255-
def __unicode__(self):
255+
def __str__(self):
256256
return "%s (%s)" % (self.url, self.name)
257257

258258
class GroupMilestoneInfo(models.Model):
@@ -268,7 +268,7 @@ class GroupMilestoneInfo(models.Model):
268268

269269
docs = models.ManyToManyField('doc.Document', blank=True)
270270

271-
def __unicode__(self):
271+
def __str__(self):
272272
return self.desc[:20] + "..."
273273
class Meta:
274274
abstract = True
@@ -288,7 +288,7 @@ class GroupStateTransitions(models.Model):
288288
state = ForeignKey('doc.State', help_text="State for which the next states should be overridden")
289289
next_states = models.ManyToManyField('doc.State', related_name='previous_groupstatetransitions_states')
290290

291-
def __unicode__(self):
291+
def __str__(self):
292292
return '%s "%s" -> %s' % (self.group.acronym, self.state.name, [s.name for s in self.next_states.all()])
293293

294294
GROUP_EVENT_CHOICES = [
@@ -309,7 +309,7 @@ class GroupEvent(models.Model):
309309
by = ForeignKey(Person)
310310
desc = models.TextField()
311311

312-
def __unicode__(self):
312+
def __str__(self):
313313
return "%s %s at %s" % (self.by.plain_name(), self.get_type_display().lower(), self.time)
314314

315315
class Meta:
@@ -326,7 +326,7 @@ class Role(models.Model):
326326
group = ForeignKey(Group)
327327
person = ForeignKey(Person)
328328
email = ForeignKey(Email, help_text="Email address used by person for this role.")
329-
def __unicode__(self):
329+
def __str__(self):
330330
return "%s is %s in %s" % (self.person.plain_name(), self.name.name, self.group.acronym or self.group.name)
331331

332332
def formatted_ascii_email(self):
@@ -347,7 +347,7 @@ class RoleHistory(models.Model):
347347
group = ForeignKey(GroupHistory)
348348
person = ForeignKey(Person)
349349
email = ForeignKey(Email, help_text="Email address used by person for this role.")
350-
def __unicode__(self):
350+
def __str__(self):
351351
return "%s is %s in %s" % (self.person.plain_name(), self.name.name, self.group.acronym)
352352

353353
class Meta:

‎ietf/iesg/models.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class TelechatAgendaItem(models.Model):
4949
type = models.IntegerField(db_column='template_type', choices=TYPE_CHOICES, default=3)
5050
title = models.CharField(max_length=255, db_column='template_title')
5151

52-
def __unicode__(self):
52+
def __str__(self):
5353
type_name = self.TYPE_CHOICES_DICT.get(self.type, str(self.type))
5454
return '%s: %s' % (type_name, self.title or "")
5555

@@ -82,7 +82,7 @@ class TelechatDate(models.Model):
8282

8383
date = models.DateField(default=next_telechat_date)
8484

85-
def __unicode__(self):
85+
def __str__(self):
8686
return self.date.isoformat()
8787

8888
class Meta:

‎ietf/ipr/models.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class IprDisclosureBase(models.Model):
2929
class Meta:
3030
ordering = ['-time', '-id']
3131

32-
def __unicode__(self):
32+
def __str__(self):
3333
return self.title
3434

3535
def get_absolute_url(self):
@@ -172,7 +172,7 @@ def formatted_name(self):
172172
else:
173173
return name
174174

175-
def __unicode__(self):
175+
def __str__(self):
176176
if self.revisions:
177177
return "%s which applies to %s-%s" % (self.disclosure, self.document.name, self.revisions)
178178
else:
@@ -183,7 +183,7 @@ class RelatedIpr(models.Model):
183183
target = ForeignKey(IprDisclosureBase,related_name='relatedipr_target_set')
184184
relationship = ForeignKey(DocRelationshipName) # Re-use; change to a dedicated RelName if needed
185185

186-
def __unicode__(self):
186+
def __str__(self):
187187
return "%s %s %s" % (self.source.title, self.relationship.name.lower(), self.target.title)
188188

189189
class IprEvent(models.Model):
@@ -196,7 +196,7 @@ class IprEvent(models.Model):
196196
in_reply_to = ForeignKey(Message, null=True, blank=True,related_name='irtoevents')
197197
response_due= models.DateTimeField(blank=True,null=True)
198198

199-
def __unicode__(self):
199+
def __str__(self):
200200
return "%s %s by %s at %s" % (self.disclosure.title, self.type.name.lower(), self.by.plain_name(), self.time)
201201

202202
def response_past_due(self):

‎ietf/liaisons/models.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class Meta:
4949
ordering = ['id']
5050

5151

52-
def __unicode__(self):
52+
def __str__(self):
5353
return self.title or "<no title>"
5454

5555
def change_state(self,state_id=None,person=None):
@@ -203,7 +203,7 @@ class LiaisonStatementAttachment(models.Model):
203203
document = ForeignKey(Document)
204204
removed = models.BooleanField(default=False)
205205

206-
def __unicode__(self):
206+
def __str__(self):
207207
return self.document.name
208208

209209

@@ -212,7 +212,7 @@ class RelatedLiaisonStatement(models.Model):
212212
target = ForeignKey(LiaisonStatement, related_name='target_of_set')
213213
relationship = ForeignKey(DocRelationshipName)
214214

215-
def __unicode__(self):
215+
def __str__(self):
216216
return "%s %s %s" % (self.source.title, self.relationship.name.lower(), self.target.title)
217217

218218

@@ -221,7 +221,7 @@ class LiaisonStatementGroupContacts(models.Model):
221221
contacts = models.CharField(max_length=255,blank=True)
222222
cc_contacts = models.CharField(max_length=255,blank=True)
223223

224-
def __unicode__(self):
224+
def __str__(self):
225225
return "%s" % self.group.name
226226

227227

@@ -232,7 +232,7 @@ class LiaisonStatementEvent(models.Model):
232232
statement = ForeignKey(LiaisonStatement)
233233
desc = models.TextField()
234234

235-
def __unicode__(self):
235+
def __str__(self):
236236
return "%s %s by %s at %s" % (self.statement.title, self.type.slug, self.by.plain_name(), self.time)
237237

238238
class Meta:

‎ietf/mailinglists/models.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright The IETF Trust 2016, All Rights Reserved
1+
# Copyright The IETF Trust 2016-2019, All Rights Reserved
22

33

44
from django.conf import settings
@@ -12,7 +12,7 @@ class List(models.Model):
1212
name = models.CharField(max_length=32)
1313
description = models.CharField(max_length=256)
1414
advertised = models.BooleanField(default=True)
15-
def __unicode__(self):
15+
def __str__(self):
1616
return "<List: %s>" % self.name
1717
def info_url(self):
1818
return settings.MAILING_LIST_INFO_URL % {'list_addr': self.name }
@@ -21,7 +21,7 @@ class Subscribed(models.Model):
2121
time = models.DateTimeField(auto_now_add=True)
2222
email = models.CharField(max_length=64, validators=[validate_email])
2323
lists = models.ManyToManyField(List)
24-
def __unicode__(self):
24+
def __str__(self):
2525
return "<Subscribed: %s at %s>" % (self.email, self.time)
2626
class Meta:
2727
verbose_name_plural = "Subscribed"
@@ -30,7 +30,7 @@ class Whitelisted(models.Model):
3030
time = models.DateTimeField(auto_now_add=True)
3131
email = models.CharField("Email address", max_length=64, validators=[validate_email])
3232
by = ForeignKey(Person)
33-
def __unicode__(self):
33+
def __str__(self):
3434
return "<Whitelisted: %s at %s>" % (self.email, self.time)
3535
class Meta:
3636
verbose_name_plural = "Whitelisted"

‎ietf/mailtrigger/models.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class MailTrigger(models.Model):
3737
class Meta:
3838
ordering = ["slug"]
3939

40-
def __unicode__(self):
40+
def __str__(self):
4141
return self.slug
4242

4343
class Recipient(models.Model):
@@ -48,7 +48,7 @@ class Recipient(models.Model):
4848
class Meta:
4949
ordering = ["slug"]
5050

51-
def __unicode__(self):
51+
def __str__(self):
5252
return self.slug
5353

5454
def gather(self, **kwargs):

0 commit comments

Comments
 (0)