Skip to content

Commit a28940f

Browse files
committed
Name/email formatting tweaks, to complement [13536].
- Legacy-Id: 13540 Note: SVN reference [13536] has been migrated to Git commit 55d36e2
1 parent 55d36e2 commit a28940f

4 files changed

Lines changed: 11 additions & 6 deletions

File tree

ietf/group/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from ietf.name.models import GroupStateName, GroupTypeName, DocTagName, GroupMilestoneStateName, RoleName
1515
from ietf.person.models import Email, Person
1616
from ietf.utils.mail import formataddr
17+
from ietf.utils.log import unreachable
1718

1819

1920
class GroupInfo(models.Model):

ietf/mailtrigger/models.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from email.utils import parseaddr
77
from ietf.utils.mail import formataddr
88

9-
109
import debug # pyflakes:ignore
1110

1211
from ietf.group.models import Role
@@ -178,10 +177,14 @@ def gather_doc_group_responsible_directors(self, **kwargs):
178177
return addrs
179178

180179
def gather_submission_authors(self, **kwargs):
180+
"""
181+
Returns a list of name and email, e.g.: [ 'Ano Nymous <ano@nymous.org>' ]
182+
Is intended for display use, not in email context.
183+
"""
181184
addrs = []
182185
if 'submission' in kwargs:
183186
submission = kwargs['submission']
184-
addrs.extend([ email.utils.formataddr((author["name"], author["email"])) for author in submission.authors if author.get("email")])
187+
addrs.extend(["%s <%s>" % (author["name"], author["email"]) for author in submission.authors if author.get("email")])
185188
return addrs
186189

187190
def gather_submission_group_chairs(self, **kwargs):

ietf/settings.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -487,9 +487,9 @@ def skip_unreadable_post(record):
487487
"ietf/settings*",
488488
"ietf/utils/templatetags/debug_filters.py",
489489
"ietf/utils/test_runner.py",
490-
"name/generate_fixtures.py",
491-
"review/import_from_review_tool.py",
492-
"stats/backfill_data.py",
490+
"ietf/name/generate_fixtures.py",
491+
"ietf/review/import_from_review_tool.py",
492+
"ietf/stats/backfill_data.py",
493493
]
494494

495495
# These are filename globs. They are used by test_parse_templates() and

ietf/submit/forms.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import pytz
66
import xml2rfc
77
import tempfile
8+
from email.utils import formataddr
89
from unidecode import unidecode
910

1011
from django import forms
@@ -351,7 +352,7 @@ def cleaned_line(self):
351352
line = self.cleaned_data["name"]
352353
email = self.cleaned_data.get("email")
353354
if email:
354-
line += u" <%s>" % email
355+
line = formataddr((line, email))
355356
return line
356357

357358
class ReplacesForm(forms.Form):

0 commit comments

Comments
 (0)