Restoring authorship annotation for <shadchin@yandex-team.ru>. Commit 1 of 2.

11 files changed, 312 insertions, 312 deletions

diff --git a/contrib/tools/python3/src/Lib/email/_header_value_parser.py b/contrib/tools/python3/src/Lib/email/_header_value_parser.py
index 51d355fbb0..a9dbc7f335 100644
--- a/contrib/tools/python3/src/Lib/email/_header_value_parser.py
+++ b/contrib/tools/python3/src/Lib/email/_header_value_parser.py
@@ -68,7 +68,7 @@ XXX: provide complete list of token types.
 """
 
 import re
-import sys
+import sys 
 import urllib   # For urllib.parse.unquote
 from string import hexdigits
 from operator import itemgetter
@@ -96,18 +96,18 @@ EXTENDED_ATTRIBUTE_ENDS = ATTRIBUTE_ENDS - set('%')
 def quote_string(value):
     return '"'+str(value).replace('\\', '\\\\').replace('"', r'\"')+'"'
 
-# Match a RFC 2047 word, looks like =?utf-8?q?someword?=
-rfc2047_matcher = re.compile(r'''
-   =\?            # literal =?
-   [^?]*          # charset
-   \?             # literal ?
-   [qQbB]         # literal 'q' or 'b', case insensitive
-   \?             # literal ?
-  .*?             # encoded word
-  \?=             # literal ?=
-''', re.VERBOSE | re.MULTILINE)
-
-
+# Match a RFC 2047 word, looks like =?utf-8?q?someword?= 
+rfc2047_matcher = re.compile(r''' 
+   =\?            # literal =? 
+   [^?]*          # charset 
+   \?             # literal ? 
+   [qQbB]         # literal 'q' or 'b', case insensitive 
+   \?             # literal ? 
+  .*?             # encoded word 
+  \?=             # literal ?= 
+''', re.VERBOSE | re.MULTILINE) 
+ 
+ 
 #
 # TokenList and its subclasses
 #
@@ -509,11 +509,11 @@ class DotAtomText(TokenList):
     as_ew_allowed = True
 
 
-class NoFoldLiteral(TokenList):
-    token_type = 'no-fold-literal'
-    as_ew_allowed = False
-
-
+class NoFoldLiteral(TokenList): 
+    token_type = 'no-fold-literal' 
+    as_ew_allowed = False 
+ 
+ 
 class AddrSpec(TokenList):
 
     token_type = 'addr-spec'
@@ -561,8 +561,8 @@ class DisplayName(Phrase):
     @property
     def display_name(self):
         res = TokenList(self)
-        if len(res) == 0:
-            return res.value
+        if len(res) == 0: 
+            return res.value 
         if res[0].token_type == 'cfws':
             res.pop(0)
         else:
@@ -584,7 +584,7 @@ class DisplayName(Phrase):
             for x in self:
                 if x.token_type == 'quoted-string':
                     quote = True
-        if len(self) != 0 and quote:
+        if len(self) != 0 and quote: 
             pre = post = ''
             if self[0].token_type=='cfws' or self[0][0].token_type=='cfws':
                 pre = ' '
@@ -730,7 +730,7 @@ class MimeParameters(TokenList):
         # to assume the RFC 2231 pieces can come in any order.  However, we
         # output them in the order that we first see a given name, which gives
         # us a stable __str__.
-        params = {}  # Using order preserving dict from Python 3.7+
+        params = {}  # Using order preserving dict from Python 3.7+ 
         for token in self:
             if not token.token_type.endswith('parameter'):
                 continue
@@ -842,23 +842,23 @@ class HeaderLabel(TokenList):
     as_ew_allowed = False
 
 
-class MsgID(TokenList):
-    token_type = 'msg-id'
-    as_ew_allowed = False
-
-    def fold(self, policy):
-        # message-id tokens may not be folded.
-        return str(self) + policy.linesep
-
-
-class MessageID(MsgID):
-    token_type = 'message-id'
-
-
-class InvalidMessageID(MessageID):
-    token_type = 'invalid-message-id'
-
-
+class MsgID(TokenList): 
+    token_type = 'msg-id' 
+    as_ew_allowed = False 
+ 
+    def fold(self, policy): 
+        # message-id tokens may not be folded. 
+        return str(self) + policy.linesep 
+ 
+ 
+class MessageID(MsgID): 
+    token_type = 'message-id' 
+ 
+ 
+class InvalidMessageID(MessageID): 
+    token_type = 'invalid-message-id' 
+ 
+ 
 class Header(TokenList):
     token_type = 'header'
 
@@ -940,10 +940,10 @@ class EWWhiteSpaceTerminal(WhiteSpaceTerminal):
         return ''
 
 
-class _InvalidEwError(errors.HeaderParseError):
-    """Invalid encoded word found while parsing headers."""
-
-
+class _InvalidEwError(errors.HeaderParseError): 
+    """Invalid encoded word found while parsing headers.""" 
+ 
+ 
 # XXX these need to become classes and used as instances so
 # that a program can't change them in a parse tree and screw
 # up other parse trees.  Maybe should have  tests for that, too.
@@ -1048,10 +1048,10 @@ def get_encoded_word(value):
         raise errors.HeaderParseError(
             "expected encoded word but found {}".format(value))
     remstr = ''.join(remainder)
-    if (len(remstr) > 1 and
-        remstr[0] in hexdigits and
-        remstr[1] in hexdigits and
-        tok.count('?') < 2):
+    if (len(remstr) > 1 and 
+        remstr[0] in hexdigits and 
+        remstr[1] in hexdigits and 
+        tok.count('?') < 2): 
         # The ? after the CTE was followed by an encoded word escape (=XX).
         rest, *remainder = remstr.split('?=', 1)
         tok = tok + '?=' + rest
@@ -1062,8 +1062,8 @@ def get_encoded_word(value):
     value = ''.join(remainder)
     try:
         text, charset, lang, defects = _ew.decode('=?' + tok + '?=')
-    except (ValueError, KeyError):
-        raise _InvalidEwError(
+    except (ValueError, KeyError): 
+        raise _InvalidEwError( 
             "encoded word format invalid: '{}'".format(ew.cte))
     ew.charset = charset
     ew.lang = lang
@@ -1078,10 +1078,10 @@ def get_encoded_word(value):
         _validate_xtext(vtext)
         ew.append(vtext)
         text = ''.join(remainder)
-    # Encoded words should be followed by a WS
-    if value and value[0] not in WSP:
-        ew.defects.append(errors.InvalidHeaderDefect(
-            "missing trailing whitespace after encoded-word"))
+    # Encoded words should be followed by a WS 
+    if value and value[0] not in WSP: 
+        ew.defects.append(errors.InvalidHeaderDefect( 
+            "missing trailing whitespace after encoded-word")) 
     return ew, value
 
 def get_unstructured(value):
@@ -1113,12 +1113,12 @@ def get_unstructured(value):
             token, value = get_fws(value)
             unstructured.append(token)
             continue
-        valid_ew = True
+        valid_ew = True 
         if value.startswith('=?'):
             try:
                 token, value = get_encoded_word(value)
-            except _InvalidEwError:
-                valid_ew = False
+            except _InvalidEwError: 
+                valid_ew = False 
             except errors.HeaderParseError:
                 # XXX: Need to figure out how to register defects when
                 # appropriate here.
@@ -1137,14 +1137,14 @@ def get_unstructured(value):
                 unstructured.append(token)
                 continue
         tok, *remainder = _wsp_splitter(value, 1)
-        # Split in the middle of an atom if there is a rfc2047 encoded word
-        # which does not have WSP on both sides. The defect will be registered
-        # the next time through the loop.
-        # This needs to only be performed when the encoded word is valid;
-        # otherwise, performing it on an invalid encoded word can cause
-        # the parser to go in an infinite loop.
-        if valid_ew and rfc2047_matcher.search(tok):
-            tok, *remainder = value.partition('=?')
+        # Split in the middle of an atom if there is a rfc2047 encoded word 
+        # which does not have WSP on both sides. The defect will be registered 
+        # the next time through the loop. 
+        # This needs to only be performed when the encoded word is valid; 
+        # otherwise, performing it on an invalid encoded word can cause 
+        # the parser to go in an infinite loop. 
+        if valid_ew and rfc2047_matcher.search(tok): 
+            tok, *remainder = value.partition('=?') 
         vtext = ValueTerminal(tok, 'vtext')
         _validate_xtext(vtext)
         unstructured.append(vtext)
@@ -1211,28 +1211,28 @@ def get_bare_quoted_string(value):
             "expected '\"' but found '{}'".format(value))
     bare_quoted_string = BareQuotedString()
     value = value[1:]
-    if value and value[0] == '"':
+    if value and value[0] == '"': 
         token, value = get_qcontent(value)
         bare_quoted_string.append(token)
     while value and value[0] != '"':
         if value[0] in WSP:
             token, value = get_fws(value)
         elif value[:2] == '=?':
-            valid_ew = False
+            valid_ew = False 
             try:
                 token, value = get_encoded_word(value)
                 bare_quoted_string.defects.append(errors.InvalidHeaderDefect(
                     "encoded word inside quoted string"))
-                valid_ew = True
+                valid_ew = True 
             except errors.HeaderParseError:
                 token, value = get_qcontent(value)
-            # Collapse the whitespace between two encoded words that occur in a
-            # bare-quoted-string.
-            if valid_ew and len(bare_quoted_string) > 1:
-                if (bare_quoted_string[-1].token_type == 'fws' and
-                        bare_quoted_string[-2].token_type == 'encoded-word'):
-                    bare_quoted_string[-1] = EWWhiteSpaceTerminal(
-                        bare_quoted_string[-1], 'fws')
+            # Collapse the whitespace between two encoded words that occur in a 
+            # bare-quoted-string. 
+            if valid_ew and len(bare_quoted_string) > 1: 
+                if (bare_quoted_string[-1].token_type == 'fws' and 
+                        bare_quoted_string[-2].token_type == 'encoded-word'): 
+                    bare_quoted_string[-1] = EWWhiteSpaceTerminal( 
+                        bare_quoted_string[-1], 'fws') 
         else:
             token, value = get_qcontent(value)
         bare_quoted_string.append(token)
@@ -1389,9 +1389,9 @@ def get_word(value):
         leader, value = get_cfws(value)
     else:
         leader = None
-    if not value:
-        raise errors.HeaderParseError(
-            "Expected 'atom' or 'quoted-string' but found nothing.")
+    if not value: 
+        raise errors.HeaderParseError( 
+            "Expected 'atom' or 'quoted-string' but found nothing.") 
     if value[0]=='"':
         token, value = get_quoted_string(value)
     elif value[0] in SPECIALS:
@@ -1616,8 +1616,8 @@ def get_domain(value):
         token, value = get_dot_atom(value)
     except errors.HeaderParseError:
         token, value = get_atom(value)
-    if value and value[0] == '@':
-        raise errors.HeaderParseError('Invalid Domain')
+    if value and value[0] == '@': 
+        raise errors.HeaderParseError('Invalid Domain') 
     if leader is not None:
         token[:0] = [leader]
     domain.append(token)
@@ -1641,7 +1641,7 @@ def get_addr_spec(value):
     addr_spec.append(token)
     if not value or value[0] != '@':
         addr_spec.defects.append(errors.InvalidHeaderDefect(
-            "addr-spec local part with no domain"))
+            "addr-spec local part with no domain")) 
         return addr_spec, value
     addr_spec.append(ValueTerminal('@', 'address-at-symbol'))
     token, value = get_domain(value[1:])
@@ -2026,118 +2026,118 @@ def get_address_list(value):
             value = value[1:]
     return address_list, value
 
-
-def get_no_fold_literal(value):
-    """ no-fold-literal = "[" *dtext "]"
-    """
-    no_fold_literal = NoFoldLiteral()
-    if not value:
-        raise errors.HeaderParseError(
-            "expected no-fold-literal but found '{}'".format(value))
-    if value[0] != '[':
-        raise errors.HeaderParseError(
-            "expected '[' at the start of no-fold-literal "
-            "but found '{}'".format(value))
-    no_fold_literal.append(ValueTerminal('[', 'no-fold-literal-start'))
-    value = value[1:]
-    token, value = get_dtext(value)
-    no_fold_literal.append(token)
-    if not value or value[0] != ']':
-        raise errors.HeaderParseError(
-            "expected ']' at the end of no-fold-literal "
-            "but found '{}'".format(value))
-    no_fold_literal.append(ValueTerminal(']', 'no-fold-literal-end'))
-    return no_fold_literal, value[1:]
-
-def get_msg_id(value):
-    """msg-id = [CFWS] "<" id-left '@' id-right  ">" [CFWS]
-       id-left = dot-atom-text / obs-id-left
-       id-right = dot-atom-text / no-fold-literal / obs-id-right
-       no-fold-literal = "[" *dtext "]"
-    """
-    msg_id = MsgID()
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        msg_id.append(token)
-    if not value or value[0] != '<':
-        raise errors.HeaderParseError(
-            "expected msg-id but found '{}'".format(value))
-    msg_id.append(ValueTerminal('<', 'msg-id-start'))
-    value = value[1:]
-    # Parse id-left.
-    try:
-        token, value = get_dot_atom_text(value)
-    except errors.HeaderParseError:
-        try:
-            # obs-id-left is same as local-part of add-spec.
-            token, value = get_obs_local_part(value)
-            msg_id.defects.append(errors.ObsoleteHeaderDefect(
-                "obsolete id-left in msg-id"))
-        except errors.HeaderParseError:
-            raise errors.HeaderParseError(
-                "expected dot-atom-text or obs-id-left"
-                " but found '{}'".format(value))
-    msg_id.append(token)
-    if not value or value[0] != '@':
-        msg_id.defects.append(errors.InvalidHeaderDefect(
-            "msg-id with no id-right"))
-        # Even though there is no id-right, if the local part
-        # ends with `>` let's just parse it too and return
-        # along with the defect.
-        if value and value[0] == '>':
-            msg_id.append(ValueTerminal('>', 'msg-id-end'))
-            value = value[1:]
-        return msg_id, value
-    msg_id.append(ValueTerminal('@', 'address-at-symbol'))
-    value = value[1:]
-    # Parse id-right.
-    try:
-        token, value = get_dot_atom_text(value)
-    except errors.HeaderParseError:
-        try:
-            token, value = get_no_fold_literal(value)
-        except errors.HeaderParseError as e:
-            try:
-                token, value = get_domain(value)
-                msg_id.defects.append(errors.ObsoleteHeaderDefect(
-                    "obsolete id-right in msg-id"))
-            except errors.HeaderParseError:
-                raise errors.HeaderParseError(
-                    "expected dot-atom-text, no-fold-literal or obs-id-right"
-                    " but found '{}'".format(value))
-    msg_id.append(token)
-    if value and value[0] == '>':
-        value = value[1:]
-    else:
-        msg_id.defects.append(errors.InvalidHeaderDefect(
-            "missing trailing '>' on msg-id"))
-    msg_id.append(ValueTerminal('>', 'msg-id-end'))
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        msg_id.append(token)
-    return msg_id, value
-
-
-def parse_message_id(value):
-    """message-id      =   "Message-ID:" msg-id CRLF
-    """
-    message_id = MessageID()
-    try:
-        token, value = get_msg_id(value)
-        message_id.append(token)
-    except errors.HeaderParseError as ex:
-        token = get_unstructured(value)
-        message_id = InvalidMessageID(token)
-        message_id.defects.append(
-            errors.InvalidHeaderDefect("Invalid msg-id: {!r}".format(ex)))
-    else:
-        # Value after parsing a valid msg_id should be None.
-        if value:
-            message_id.defects.append(errors.InvalidHeaderDefect(
-                "Unexpected {!r}".format(value)))
-
-    return message_id
-
+ 
+def get_no_fold_literal(value): 
+    """ no-fold-literal = "[" *dtext "]" 
+    """ 
+    no_fold_literal = NoFoldLiteral() 
+    if not value: 
+        raise errors.HeaderParseError( 
+            "expected no-fold-literal but found '{}'".format(value)) 
+    if value[0] != '[': 
+        raise errors.HeaderParseError( 
+            "expected '[' at the start of no-fold-literal " 
+            "but found '{}'".format(value)) 
+    no_fold_literal.append(ValueTerminal('[', 'no-fold-literal-start')) 
+    value = value[1:] 
+    token, value = get_dtext(value) 
+    no_fold_literal.append(token) 
+    if not value or value[0] != ']': 
+        raise errors.HeaderParseError( 
+            "expected ']' at the end of no-fold-literal " 
+            "but found '{}'".format(value)) 
+    no_fold_literal.append(ValueTerminal(']', 'no-fold-literal-end')) 
+    return no_fold_literal, value[1:] 
+ 
+def get_msg_id(value): 
+    """msg-id = [CFWS] "<" id-left '@' id-right  ">" [CFWS] 
+       id-left = dot-atom-text / obs-id-left 
+       id-right = dot-atom-text / no-fold-literal / obs-id-right 
+       no-fold-literal = "[" *dtext "]" 
+    """ 
+    msg_id = MsgID() 
+    if value and value[0] in CFWS_LEADER: 
+        token, value = get_cfws(value) 
+        msg_id.append(token) 
+    if not value or value[0] != '<': 
+        raise errors.HeaderParseError( 
+            "expected msg-id but found '{}'".format(value)) 
+    msg_id.append(ValueTerminal('<', 'msg-id-start')) 
+    value = value[1:] 
+    # Parse id-left. 
+    try: 
+        token, value = get_dot_atom_text(value) 
+    except errors.HeaderParseError: 
+        try: 
+            # obs-id-left is same as local-part of add-spec. 
+            token, value = get_obs_local_part(value) 
+            msg_id.defects.append(errors.ObsoleteHeaderDefect( 
+                "obsolete id-left in msg-id")) 
+        except errors.HeaderParseError: 
+            raise errors.HeaderParseError( 
+                "expected dot-atom-text or obs-id-left" 
+                " but found '{}'".format(value)) 
+    msg_id.append(token) 
+    if not value or value[0] != '@': 
+        msg_id.defects.append(errors.InvalidHeaderDefect( 
+            "msg-id with no id-right")) 
+        # Even though there is no id-right, if the local part 
+        # ends with `>` let's just parse it too and return 
+        # along with the defect. 
+        if value and value[0] == '>': 
+            msg_id.append(ValueTerminal('>', 'msg-id-end')) 
+            value = value[1:] 
+        return msg_id, value 
+    msg_id.append(ValueTerminal('@', 'address-at-symbol')) 
+    value = value[1:] 
+    # Parse id-right. 
+    try: 
+        token, value = get_dot_atom_text(value) 
+    except errors.HeaderParseError: 
+        try: 
+            token, value = get_no_fold_literal(value) 
+        except errors.HeaderParseError as e: 
+            try: 
+                token, value = get_domain(value) 
+                msg_id.defects.append(errors.ObsoleteHeaderDefect( 
+                    "obsolete id-right in msg-id")) 
+            except errors.HeaderParseError: 
+                raise errors.HeaderParseError( 
+                    "expected dot-atom-text, no-fold-literal or obs-id-right" 
+                    " but found '{}'".format(value)) 
+    msg_id.append(token) 
+    if value and value[0] == '>': 
+        value = value[1:] 
+    else: 
+        msg_id.defects.append(errors.InvalidHeaderDefect( 
+            "missing trailing '>' on msg-id")) 
+    msg_id.append(ValueTerminal('>', 'msg-id-end')) 
+    if value and value[0] in CFWS_LEADER: 
+        token, value = get_cfws(value) 
+        msg_id.append(token) 
+    return msg_id, value 
+ 
+ 
+def parse_message_id(value): 
+    """message-id      =   "Message-ID:" msg-id CRLF 
+    """ 
+    message_id = MessageID() 
+    try: 
+        token, value = get_msg_id(value) 
+        message_id.append(token) 
+    except errors.HeaderParseError as ex: 
+        token = get_unstructured(value) 
+        message_id = InvalidMessageID(token) 
+        message_id.defects.append( 
+            errors.InvalidHeaderDefect("Invalid msg-id: {!r}".format(ex))) 
+    else: 
+        # Value after parsing a valid msg_id should be None. 
+        if value: 
+            message_id.defects.append(errors.InvalidHeaderDefect( 
+                "Unexpected {!r}".format(value))) 
+ 
+    return message_id 
+ 
 #
 # XXX: As I begin to add additional header parsers, I'm realizing we probably
 # have two level of parser routines: the get_XXX methods that get a token in
@@ -2535,9 +2535,9 @@ def get_parameter(value):
         while value:
             if value[0] in WSP:
                 token, value = get_fws(value)
-            elif value[0] == '"':
-                token = ValueTerminal('"', 'DQUOTE')
-                value = value[1:]
+            elif value[0] == '"': 
+                token = ValueTerminal('"', 'DQUOTE') 
+                value = value[1:] 
             else:
                 token, value = get_qcontent(value)
             v.append(token)
@@ -2558,7 +2558,7 @@ def parse_mime_parameters(value):
     the formal RFC grammar, but it is more convenient for us for the set of
     parameters to be treated as its own TokenList.
 
-    This is 'parse' routine because it consumes the remaining value, but it
+    This is 'parse' routine because it consumes the remaining value, but it 
     would never be called to parse a full header.  Instead it is called to
     parse everything after the non-parameter value of a specific MIME header.
 
@@ -2764,7 +2764,7 @@ def _refold_parse_tree(parse_tree, *, policy):
 
     """
     # max_line_length 0/None means no limit, ie: infinitely long.
-    maxlen = policy.max_line_length or sys.maxsize
+    maxlen = policy.max_line_length or sys.maxsize 
     encoding = 'utf-8' if policy.utf8 else 'us-ascii'
     lines = ['']
     last_ew = None
@@ -2778,9 +2778,9 @@ def _refold_parse_tree(parse_tree, *, policy):
             wrap_as_ew_blocked -= 1
             continue
         tstr = str(part)
-        if part.token_type == 'ptext' and set(tstr) & SPECIALS:
-            # Encode if tstr contains special characters.
-            want_encoding = True
+        if part.token_type == 'ptext' and set(tstr) & SPECIALS: 
+            # Encode if tstr contains special characters. 
+            want_encoding = True 
         try:
             tstr.encode(encoding)
             charset = encoding
@@ -2802,7 +2802,7 @@ def _refold_parse_tree(parse_tree, *, policy):
                 want_encoding = False
                 last_ew = None
                 if part.syntactic_break:
-                    encoded_part = part.fold(policy=policy)[:-len(policy.linesep)]
+                    encoded_part = part.fold(policy=policy)[:-len(policy.linesep)] 
                     if policy.linesep not in encoded_part:
                         # It fits on a single line
                         if len(encoded_part) > maxlen - len(lines[-1]):
@@ -2837,7 +2837,7 @@ def _refold_parse_tree(parse_tree, *, policy):
             newline = _steal_trailing_WSP_if_exists(lines)
             if newline or part.startswith_fws():
                 lines.append(newline + tstr)
-                last_ew = None
+                last_ew = None 
                 continue
         if not hasattr(part, 'encode'):
             # It's not a terminal, try folding the subparts.
@@ -2891,36 +2891,36 @@ def _fold_as_ew(to_encode, lines, maxlen, last_ew, ew_combine_allowed, charset):
         trailing_wsp = to_encode[-1]
         to_encode = to_encode[:-1]
     new_last_ew = len(lines[-1]) if last_ew is None else last_ew
-
-    encode_as = 'utf-8' if charset == 'us-ascii' else charset
-
-    # The RFC2047 chrome takes up 7 characters plus the length
-    # of the charset name.
-    chrome_len = len(encode_as) + 7
-
-    if (chrome_len + 1) >= maxlen:
-        raise errors.HeaderParseError(
-            "max_line_length is too small to fit an encoded word")
-
+ 
+    encode_as = 'utf-8' if charset == 'us-ascii' else charset 
+ 
+    # The RFC2047 chrome takes up 7 characters plus the length 
+    # of the charset name. 
+    chrome_len = len(encode_as) + 7 
+ 
+    if (chrome_len + 1) >= maxlen: 
+        raise errors.HeaderParseError( 
+            "max_line_length is too small to fit an encoded word") 
+ 
     while to_encode:
         remaining_space = maxlen - len(lines[-1])
-        text_space = remaining_space - chrome_len
+        text_space = remaining_space - chrome_len 
         if text_space <= 0:
             lines.append(' ')
             continue
-
-        to_encode_word = to_encode[:text_space]
-        encoded_word = _ew.encode(to_encode_word, charset=encode_as)
-        excess = len(encoded_word) - remaining_space
-        while excess > 0:
-            # Since the chunk to encode is guaranteed to fit into less than 100 characters,
-            # shrinking it by one at a time shouldn't take long.
-            to_encode_word = to_encode_word[:-1]
-            encoded_word = _ew.encode(to_encode_word, charset=encode_as)
-            excess = len(encoded_word) - remaining_space
-        lines[-1] += encoded_word
-        to_encode = to_encode[len(to_encode_word):]
-
+ 
+        to_encode_word = to_encode[:text_space] 
+        encoded_word = _ew.encode(to_encode_word, charset=encode_as) 
+        excess = len(encoded_word) - remaining_space 
+        while excess > 0: 
+            # Since the chunk to encode is guaranteed to fit into less than 100 characters, 
+            # shrinking it by one at a time shouldn't take long. 
+            to_encode_word = to_encode_word[:-1] 
+            encoded_word = _ew.encode(to_encode_word, charset=encode_as) 
+            excess = len(encoded_word) - remaining_space 
+        lines[-1] += encoded_word 
+        to_encode = to_encode[len(to_encode_word):] 
+ 
         if to_encode:
             lines.append(' ')
             new_last_ew = len(lines[-1])
diff --git a/contrib/tools/python3/src/Lib/email/_parseaddr.py b/contrib/tools/python3/src/Lib/email/_parseaddr.py
index c5a7b23193..bb53fcc278 100644
--- a/contrib/tools/python3/src/Lib/email/_parseaddr.py
+++ b/contrib/tools/python3/src/Lib/email/_parseaddr.py
@@ -67,8 +67,8 @@ def _parsedate_tz(data):
     if not data:
         return
     data = data.split()
-    if not data:  # This happens for whitespace-only input.
-        return None
+    if not data:  # This happens for whitespace-only input. 
+        return None 
     # The FWS after the comma after the day-of-week is optional, so search and
     # adjust for this.
     if data[0].endswith(',') or data[0].lower() in _daynames:
@@ -128,8 +128,8 @@ def _parsedate_tz(data):
             tss = 0
         elif len(tm) == 3:
             [thh, tmm, tss] = tm
-        else:
-            return None
+        else: 
+            return None 
     else:
         return None
     try:
@@ -383,12 +383,12 @@ class AddrlistClass:
         aslist.append('@')
         self.pos += 1
         self.gotonext()
-        domain = self.getdomain()
-        if not domain:
-            # Invalid domain, return an empty address instead of returning a
-            # local part to denote failed parsing.
-            return EMPTYSTRING
-        return EMPTYSTRING.join(aslist) + domain
+        domain = self.getdomain() 
+        if not domain: 
+            # Invalid domain, return an empty address instead of returning a 
+            # local part to denote failed parsing. 
+            return EMPTYSTRING 
+        return EMPTYSTRING.join(aslist) + domain 
 
     def getdomain(self):
         """Get the complete domain name from an address."""
@@ -403,10 +403,10 @@ class AddrlistClass:
             elif self.field[self.pos] == '.':
                 self.pos += 1
                 sdlist.append('.')
-            elif self.field[self.pos] == '@':
-                # bpo-34155: Don't parse domains with two `@` like
-                # `a@malicious.org@important.com`.
-                return EMPTYSTRING
+            elif self.field[self.pos] == '@': 
+                # bpo-34155: Don't parse domains with two `@` like 
+                # `a@malicious.org@important.com`. 
+                return EMPTYSTRING 
             elif self.field[self.pos] in self.atomends:
                 break
             else:
diff --git a/contrib/tools/python3/src/Lib/email/charset.py b/contrib/tools/python3/src/Lib/email/charset.py
index d3d759ad91..2573893187 100644
--- a/contrib/tools/python3/src/Lib/email/charset.py
+++ b/contrib/tools/python3/src/Lib/email/charset.py
@@ -241,7 +241,7 @@ class Charset:
         self.output_codec = CODEC_MAP.get(self.output_charset,
                                           self.output_charset)
 
-    def __repr__(self):
+    def __repr__(self): 
         return self.input_charset.lower()
 
     def __eq__(self, other):
diff --git a/contrib/tools/python3/src/Lib/email/contentmanager.py b/contrib/tools/python3/src/Lib/email/contentmanager.py
index fcf278dbcc..01cbb79260 100644
--- a/contrib/tools/python3/src/Lib/email/contentmanager.py
+++ b/contrib/tools/python3/src/Lib/email/contentmanager.py
@@ -144,15 +144,15 @@ def _encode_text(string, charset, cte, policy):
     linesep = policy.linesep.encode('ascii')
     def embedded_body(lines): return linesep.join(lines) + linesep
     def normal_body(lines): return b'\n'.join(lines) + b'\n'
-    if cte is None:
+    if cte is None: 
         # Use heuristics to decide on the "best" encoding.
-        if max((len(x) for x in lines), default=0) <= policy.max_line_length:
-            try:
-                return '7bit', normal_body(lines).decode('ascii')
-            except UnicodeDecodeError:
-                pass
-            if policy.cte_type == '8bit':
-                return '8bit', normal_body(lines).decode('ascii', 'surrogateescape')
+        if max((len(x) for x in lines), default=0) <= policy.max_line_length: 
+            try: 
+                return '7bit', normal_body(lines).decode('ascii') 
+            except UnicodeDecodeError: 
+                pass 
+            if policy.cte_type == '8bit': 
+                return '8bit', normal_body(lines).decode('ascii', 'surrogateescape') 
         sniff = embedded_body(lines[:10])
         sniff_qp = quoprimime.body_encode(sniff.decode('latin-1'),
                                           policy.max_line_length)
@@ -238,7 +238,7 @@ def set_bytes_content(msg, data, maintype, subtype, cte='base64',
         data = binascii.b2a_qp(data, istext=False, header=False, quotetabs=True)
         data = data.decode('ascii')
     elif cte == '7bit':
-        data = data.decode('ascii')
+        data = data.decode('ascii') 
     elif cte in ('8bit', 'binary'):
         data = data.decode('ascii', 'surrogateescape')
     msg.set_payload(data)
diff --git a/contrib/tools/python3/src/Lib/email/feedparser.py b/contrib/tools/python3/src/Lib/email/feedparser.py
index 97d3f5144d..36909ab31c 100644
--- a/contrib/tools/python3/src/Lib/email/feedparser.py
+++ b/contrib/tools/python3/src/Lib/email/feedparser.py
@@ -320,7 +320,7 @@ class FeedParser:
                 self._cur.set_payload(EMPTYSTRING.join(lines))
                 return
             # Make sure a valid content type was specified per RFC 2045:6.4.
-            if (str(self._cur.get('content-transfer-encoding', '8bit')).lower()
+            if (str(self._cur.get('content-transfer-encoding', '8bit')).lower() 
                     not in ('7bit', '8bit', 'binary')):
                 defect = errors.InvalidMultipartContentTransferEncodingDefect()
                 self.policy.handle_defect(self._cur, defect)
diff --git a/contrib/tools/python3/src/Lib/email/generator.py b/contrib/tools/python3/src/Lib/email/generator.py
index c9b121624e..db007a5652 100644
--- a/contrib/tools/python3/src/Lib/email/generator.py
+++ b/contrib/tools/python3/src/Lib/email/generator.py
@@ -186,11 +186,11 @@ class Generator:
         # If we munged the cte, copy the message again and re-fix the CTE.
         if munge_cte:
             msg = deepcopy(msg)
-            # Preserve the header order if the CTE header already exists.
-            if msg.get('content-transfer-encoding') is None:
-                msg['Content-Transfer-Encoding'] = munge_cte[0]
-            else:
-                msg.replace_header('content-transfer-encoding', munge_cte[0])
+            # Preserve the header order if the CTE header already exists. 
+            if msg.get('content-transfer-encoding') is None: 
+                msg['Content-Transfer-Encoding'] = munge_cte[0] 
+            else: 
+                msg.replace_header('content-transfer-encoding', munge_cte[0]) 
             msg.replace_header('content-type', munge_cte[1])
         # Write the headers.  First we see if the message object wants to
         # handle that itself.  If not, we'll do it generically.
diff --git a/contrib/tools/python3/src/Lib/email/header.py b/contrib/tools/python3/src/Lib/email/header.py
index 4ab0032bc6..ce19f67d10 100644
--- a/contrib/tools/python3/src/Lib/email/header.py
+++ b/contrib/tools/python3/src/Lib/email/header.py
@@ -431,7 +431,7 @@ class _ValueFormatter:
         if end_of_line != (' ', ''):
             self._current_line.push(*end_of_line)
         if len(self._current_line) > 0:
-            if self._current_line.is_onlyws() and self._lines:
+            if self._current_line.is_onlyws() and self._lines: 
                 self._lines[-1] += str(self._current_line)
             else:
                 self._lines.append(str(self._current_line))
diff --git a/contrib/tools/python3/src/Lib/email/headerregistry.py b/contrib/tools/python3/src/Lib/email/headerregistry.py
index 5d84fc0d82..d8b1f2f073 100644
--- a/contrib/tools/python3/src/Lib/email/headerregistry.py
+++ b/contrib/tools/python3/src/Lib/email/headerregistry.py
@@ -31,11 +31,11 @@ class Address:
         without any Content Transfer Encoding.
 
         """
-
-        inputs = ''.join(filter(None, (display_name, username, domain, addr_spec)))
-        if '\r' in inputs or '\n' in inputs:
-            raise ValueError("invalid arguments; address parts cannot contain CR or LF")
-
+ 
+        inputs = ''.join(filter(None, (display_name, username, domain, addr_spec))) 
+        if '\r' in inputs or '\n' in inputs: 
+            raise ValueError("invalid arguments; address parts cannot contain CR or LF") 
+ 
         # This clause with its potential 'raise' may only happen when an
         # application program creates an Address object using an addr_spec
         # keyword.  The email library code itself must always supply username
@@ -74,9 +74,9 @@ class Address:
         """The addr_spec (username@domain) portion of the address, quoted
         according to RFC 5322 rules, but with no Content Transfer Encoding.
         """
-        lp = self.username
-        if not parser.DOT_ATOM_ENDS.isdisjoint(lp):
-            lp = parser.quote_string(lp)
+        lp = self.username 
+        if not parser.DOT_ATOM_ENDS.isdisjoint(lp): 
+            lp = parser.quote_string(lp) 
         if self.domain:
             return lp + '@' + self.domain
         if not lp:
@@ -89,17 +89,17 @@ class Address:
                         self.display_name, self.username, self.domain)
 
     def __str__(self):
-        disp = self.display_name
-        if not parser.SPECIALS.isdisjoint(disp):
-            disp = parser.quote_string(disp)
+        disp = self.display_name 
+        if not parser.SPECIALS.isdisjoint(disp): 
+            disp = parser.quote_string(disp) 
         if disp:
             addr_spec = '' if self.addr_spec=='<>' else self.addr_spec
             return "{} <{}>".format(disp, addr_spec)
         return self.addr_spec
 
     def __eq__(self, other):
-        if not isinstance(other, Address):
-            return NotImplemented
+        if not isinstance(other, Address): 
+            return NotImplemented 
         return (self.display_name == other.display_name and
                 self.username == other.username and
                 self.domain == other.domain)
@@ -142,15 +142,15 @@ class Group:
         if self.display_name is None and len(self.addresses)==1:
             return str(self.addresses[0])
         disp = self.display_name
-        if disp is not None and not parser.SPECIALS.isdisjoint(disp):
-            disp = parser.quote_string(disp)
+        if disp is not None and not parser.SPECIALS.isdisjoint(disp): 
+            disp = parser.quote_string(disp) 
         adrstr = ", ".join(str(x) for x in self.addresses)
         adrstr = ' ' + adrstr if adrstr else adrstr
         return "{}:{};".format(disp, adrstr)
 
     def __eq__(self, other):
-        if not isinstance(other, Group):
-            return NotImplemented
+        if not isinstance(other, Group): 
+            return NotImplemented 
         return (self.display_name == other.display_name and
                 self.addresses == other.addresses)
 
@@ -244,7 +244,7 @@ class BaseHeader(str):
         the header name and the ': ' separator.
 
         """
-        # At some point we need to put fws here if it was in the source.
+        # At some point we need to put fws here if it was in the source. 
         header = parser.Header([
             parser.HeaderLabel([
                 parser.ValueTerminal(self.name, 'header-name'),
@@ -519,18 +519,18 @@ class ContentTransferEncodingHeader:
         return self._cte
 
 
-class MessageIDHeader:
-
-    max_count = 1
-    value_parser = staticmethod(parser.parse_message_id)
-
-    @classmethod
-    def parse(cls, value, kwds):
-        kwds['parse_tree'] = parse_tree = cls.value_parser(value)
-        kwds['decoded'] = str(parse_tree)
-        kwds['defects'].extend(parse_tree.all_defects)
-
-
+class MessageIDHeader: 
+ 
+    max_count = 1 
+    value_parser = staticmethod(parser.parse_message_id) 
+ 
+    @classmethod 
+    def parse(cls, value, kwds): 
+        kwds['parse_tree'] = parse_tree = cls.value_parser(value) 
+        kwds['decoded'] = str(parse_tree) 
+        kwds['defects'].extend(parse_tree.all_defects) 
+ 
+ 
 # The header factory #
 
 _default_header_map = {
@@ -553,7 +553,7 @@ _default_header_map = {
     'content-type':                 ContentTypeHeader,
     'content-disposition':          ContentDispositionHeader,
     'content-transfer-encoding':    ContentTransferEncodingHeader,
-    'message-id':                   MessageIDHeader,
+    'message-id':                   MessageIDHeader, 
     }
 
 class HeaderRegistry:
diff --git a/contrib/tools/python3/src/Lib/email/message.py b/contrib/tools/python3/src/Lib/email/message.py
index 6752ce0fa1..110342f5f9 100644
--- a/contrib/tools/python3/src/Lib/email/message.py
+++ b/contrib/tools/python3/src/Lib/email/message.py
@@ -141,7 +141,7 @@ class Message:
         header.  For backward compatibility reasons, if maxheaderlen is
         not specified it defaults to 0, so you must override it explicitly
         if you want a different maxheaderlen.  'policy' is passed to the
-        Generator instance used to serialize the message; if it is not
+        Generator instance used to serialize the message; if it is not 
         specified the policy associated with the message instance is used.
 
         If the message object contains binary data that is not encoded
@@ -948,7 +948,7 @@ class MIMEPart(Message):
         if policy is None:
             from email.policy import default
             policy = default
-        super().__init__(policy)
+        super().__init__(policy) 
 
 
     def as_string(self, unixfrom=False, maxheaderlen=None, policy=None):
@@ -958,14 +958,14 @@ class MIMEPart(Message):
         header.  maxheaderlen is retained for backward compatibility with the
         base Message class, but defaults to None, meaning that the policy value
         for max_line_length controls the header maximum length.  'policy' is
-        passed to the Generator instance used to serialize the message; if it
+        passed to the Generator instance used to serialize the message; if it 
         is not specified the policy associated with the message instance is
         used.
         """
         policy = self.policy if policy is None else policy
         if maxheaderlen is None:
             maxheaderlen = policy.max_line_length
-        return super().as_string(unixfrom, maxheaderlen, policy)
+        return super().as_string(unixfrom, maxheaderlen, policy) 
 
     def __str__(self):
         return self.as_string(policy=self.policy.clone(utf8=True))
@@ -982,7 +982,7 @@ class MIMEPart(Message):
             if subtype in preferencelist:
                 yield (preferencelist.index(subtype), part)
             return
-        if maintype != 'multipart' or not self.is_multipart():
+        if maintype != 'multipart' or not self.is_multipart(): 
             return
         if subtype != 'related':
             for subpart in part.iter_parts():
@@ -1041,16 +1041,16 @@ class MIMEPart(Message):
         maintype, subtype = self.get_content_type().split('/')
         if maintype != 'multipart' or subtype == 'alternative':
             return
-        payload = self.get_payload()
-        # Certain malformed messages can have content type set to `multipart/*`
-        # but still have single part body, in which case payload.copy() can
-        # fail with AttributeError.
-        try:
-            parts = payload.copy()
-        except AttributeError:
-            # payload is not a list, it is most probably a string.
-            return
-
+        payload = self.get_payload() 
+        # Certain malformed messages can have content type set to `multipart/*` 
+        # but still have single part body, in which case payload.copy() can 
+        # fail with AttributeError. 
+        try: 
+            parts = payload.copy() 
+        except AttributeError: 
+            # payload is not a list, it is most probably a string. 
+            return 
+ 
         if maintype == 'multipart' and subtype == 'related':
             # For related, we treat everything but the root as an attachment.
             # The root may be indicated by 'start'; if there's no start or we
@@ -1087,7 +1087,7 @@ class MIMEPart(Message):
 
         Return an empty iterator for a non-multipart.
         """
-        if self.is_multipart():
+        if self.is_multipart(): 
             yield from self.get_payload()
 
     def get_content(self, *args, content_manager=None, **kw):
diff --git a/contrib/tools/python3/src/Lib/email/policy.py b/contrib/tools/python3/src/Lib/email/policy.py
index 611deb50bb..6028e0ceeb 100644
--- a/contrib/tools/python3/src/Lib/email/policy.py
+++ b/contrib/tools/python3/src/Lib/email/policy.py
@@ -3,7 +3,7 @@ code that adds all the email6 features.
 """
 
 import re
-import sys
+import sys 
 from email._policybase import Policy, Compat32, compat32, _extend_docstrings
 from email.utils import _has_surrogates
 from email.headerregistry import HeaderRegistry as HeaderRegistry
@@ -204,7 +204,7 @@ class EmailPolicy(Policy):
     def _fold(self, name, value, refold_binary=False):
         if hasattr(value, 'name'):
             return value.fold(policy=self)
-        maxlen = self.max_line_length if self.max_line_length else sys.maxsize
+        maxlen = self.max_line_length if self.max_line_length else sys.maxsize 
         lines = value.splitlines()
         refold = (self.refold_source == 'all' or
                   self.refold_source == 'long' and
diff --git a/contrib/tools/python3/src/Lib/email/utils.py b/contrib/tools/python3/src/Lib/email/utils.py
index 48d30160aa..c146b8c075 100644
--- a/contrib/tools/python3/src/Lib/email/utils.py
+++ b/contrib/tools/python3/src/Lib/email/utils.py
@@ -81,7 +81,7 @@ def formataddr(pair, charset='utf-8'):
     If the first element of pair is false, then the second element is
     returned unmodified.
 
-    The optional charset is the character set that is used to encode
+    The optional charset is the character set that is used to encode 
     realname in case realname is not ASCII safe.  Can be an instance of str or
     a Charset-like object which has a header_encode method.  Default is
     'utf-8'.
@@ -109,7 +109,7 @@ def formataddr(pair, charset='utf-8'):
 
 def getaddresses(fieldvalues):
     """Return a list of (REALNAME, EMAIL) for each fieldvalue."""
-    all = COMMASPACE.join(str(v) for v in fieldvalues)
+    all = COMMASPACE.join(str(v) for v in fieldvalues) 
     a = _AddressList(all)
     return a.addresslist
 
@@ -259,13 +259,13 @@ def decode_params(params):
 
     params is a sequence of 2-tuples containing (param name, string value).
     """
-    new_params = [params[0]]
+    new_params = [params[0]] 
     # Map parameter's name to a list of continuations.  The values are a
     # 3-tuple of the continuation number, the string value, and a flag
     # specifying whether a particular segment is %-encoded.
     rfc2231_params = {}
-    for name, value in params[1:]:
-        encoded = name.endswith('*')
+    for name, value in params[1:]: 
+        encoded = name.endswith('*') 
         value = unquote(value)
         mo = rfc2231_continuation.match(name)
         if mo: