Clean up unused variables and imports in the email module

python · warsaw · Apr 24, 2023 · Mar 6, 2023 · Mar 7, 2023 · Mar 7, 2023
commit e579c75073b1551d112508d18aab7c5106003e28
@@ -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)
@@ -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(
@@ -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)
@@ -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)
@@ -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"))

@@ -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))

@@ -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

@@ -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."""