Skip to content

gh-102498 Clean up unused variables and imports in the email module #102482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
warsaw merged 16 commits into from
Apr 24, 2023
+6 −10
Merged

gh-102498 Clean up unused variables and imports in the email module #102482

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
dc7176e
Clean up unused variables and imports in the email module
JosephSBoyle Mar 6, 2023
d78691f
Remove extra newline char
JosephSBoyle Mar 7, 2023
8cda6c2
Remove superflous dict+unpacking syntax
JosephSBoyle Mar 7, 2023
aa6402a
Remove unused 'msg' var
JosephSBoyle Mar 7, 2023
e579c75
Clean up unused variables and imports in the email module
JosephSBoyle Mar 6, 2023
f96ae11
Remove extra newline char
JosephSBoyle Mar 7, 2023
d2f40af
Remove superflous dict+unpacking syntax
JosephSBoyle Mar 7, 2023
76f5222
Remove unused 'msg' var
JosephSBoyle Mar 7, 2023
b2f6548
Merge branch 'main' into fix-unused-vars-in-email
JosephSBoyle Mar 8, 2023
45fa813
Merge branch 'fix-unused-vars-in-email' of github.com:JosephSBoyle/cp…
JosephSBoyle Mar 9, 2023
71e6e58
Merge remote-tracking branch 'upstream/main' into fix-unused-vars-in-…
JosephSBoyle Mar 9, 2023
3e781bf
Merge branch 'main' into fix-unused-vars-in-email
JosephSBoyle Mar 27, 2023
8a5e896
Merge branch 'main' into fix-unused-vars-in-email
JosephSBoyle Apr 3, 2023
f8f97e1
Merge branch 'main' into fix-unused-vars-in-email
JosephSBoyle Apr 10, 2023
40a3ad9
Merge branch 'main' into fix-unused-vars-in-email
JosephSBoyle Apr 22, 2023
1cc123f
Merge branch 'main' into fix-unused-vars-in-email
warsaw Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Clean up unused variables and imports in the email module
  • Loading branch information
@JosephSBoyle
JosephSBoyle committed Mar 7, 2023
commit dc7176ee4d16959295603fc2360837117d4b69ce
8 changes: 3 additions & 5 deletions Lib/email/_header_value_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1987,7 +1987,7 @@ def get_address_list(value):
try:
token, value = get_address(value)
address_list.append(token)
except errors.HeaderParseError as err:
except errors.HeaderParseError:
leader = None
if value[0] in CFWS_LEADER:
leader, value = get_cfws(value)
Expand Down Expand Up @@ -2096,7 +2096,7 @@ def get_msg_id(value):
except errors.HeaderParseError:
try:
token, value = get_no_fold_literal(value)
except errors.HeaderParseError as e:
except errors.HeaderParseError:
try:
token, value = get_domain(value)
msg_id.defects.append(errors.ObsoleteHeaderDefect(
Expand Down Expand Up @@ -2443,7 +2443,6 @@ def get_parameter(value):
raise errors.HeaderParseError("Parameter not followed by '='")
param.append(ValueTerminal('=', 'parameter-separator'))
value = value[1:]
leader = None
if value and value[0] in CFWS_LEADER:
token, value = get_cfws(value)
param.append(token)
Expand Down Expand Up @@ -2568,7 +2567,7 @@ def parse_mime_parameters(value):
try:
token, value = get_parameter(value)
mime_parameters.append(token)
except errors.HeaderParseError as err:
except errors.HeaderParseError:
leader = None
if value[0] in CFWS_LEADER:
leader, value = get_cfws(value)
Expand Down Expand Up @@ -2626,7 +2625,6 @@ def parse_content_type_header(value):
don't do that.
"""
ctype = ContentType()
recover = False
if not value:
ctype.defects.append(errors.HeaderMissingRequiredValue(
"Missing content type specification"))
Expand Down
1 change: 0 additions & 1 deletion Lib/email/charset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,6 @@ def header_encode_lines(self, string, maxlengths):
if not lines and not current_line:
lines.append(None)
else:
separator = (' ' if lines else '')
joined_line = EMPTYSTRING.join(current_line)
header_bytes = _encode(joined_line, codec)
lines.append(encoder(header_bytes))
Expand Down
2 changes: 1 addition & 1 deletion Lib/email/message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# Intrapackage imports
from email import utils
from email import errors
from email._policybase import Policy, compat32
from email._policybase import compat32
from email import charset as _charset
from email._encoded_words import decode_b
Charset = _charset.Charset
Expand Down
3 changes: 1 addition & 2 deletions Lib/email/mime/text.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@

__all__ = ['MIMEText']

from email.charset import Charset
from email.mime.nonmultipart import MIMENonMultipart



class MIMEText(MIMENonMultipart):
"""Class for generating text/* type MIME documents."""

Expand Down