Skip to content

Commit f86e43d

Browse files
committed
Wrap formataddr CR/LF check under 80 columns
1 parent 0e91fe3 commit f86e43d

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

Lib/email/utils.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,10 @@ def formataddr(pair, charset='utf-8', *, strict=True):
8686
contain CR or LF, which are not allowed in an email address.
8787
"""
8888
name, address = pair
89-
if strict and ('\r' in address or '\n' in address or (name and ('\r' in name or '\n' in name))):
90-
raise ValueError("invalid arguments; address parts cannot contain CR or LF")
89+
if strict and ('\r' in address or '\n' in address
90+
or (name and ('\r' in name or '\n' in name))):
91+
raise ValueError(
92+
"invalid arguments; address parts cannot contain CR or LF")
9193
# The address MUST (per RFC) be ascii, so raise a UnicodeError if it isn't.
9294
address.encode('ascii')
9395
if name:

0 commit comments

Comments
 (0)