Merge heads.

Lib/email/architecture.rst

@@ -24,9 +24,9 @@ The email package consists of three major components:
 Conceptually the package is organized around the model.  The model provides both
 "external" APIs intended for use by application programs using the library,
 and "internal" APIs intended for use by the Parser and Generator components.
-This division is intentionally a bit fuzy; the API described by this documentation
-is all a public, stable API.  This allows for an application with special needs
-to implement its own parser and/or generator.
+This division is intentionally a bit fuzzy; the API described by this
+documentation is all a public, stable API.  This allows for an application
+with special needs to implement its own parser and/or generator.
 
 In addition to the three major functional components, there is a third key
 component to the architecture:

Lib/email/generator.py

@@ -349,7 +349,7 @@ class Generator:
     # This used to be a module level function; we use a classmethod for this
     # and _compile_re so we can continue to provide the module level function
     # for backward compatibility by doing
-    #   _make_boudary = Generator._make_boundary
+    #   _make_boundary = Generator._make_boundary
     # at the end of the module.  It *is* internal, so we could drop that...
     @classmethod
     def _make_boundary(cls, text=None):

Lib/test/test_email/test_email.py

@@ -926,7 +926,7 @@ Subject: the first part of this is short,
 This is a long line that has two whitespaces  in a row.  This used to cause
  truncation of the header when folded""")
 
-    def test_splitter_split_on_punctuation_only_if_fws(self):
+    def test_splitter_split_on_punctuation_only_if_fws_with_header(self):
         eq = self.ndiffAssertEqual
         h = Header('thisverylongheaderhas;semicolons;and,commas,but'
             'they;arenotlegal;fold,points')
@@ -4214,9 +4214,6 @@ class TestQuopri(unittest.TestCase):
         self._test_encode('x' * 200 + '\n',
                 2 * ('x' * 75 + '=\n') + 'x' * 50 + '\n')
 
-    def test_encode_one_long_line(self):
-        self._test_encode('x' * 100 + '\n', 'x' * 75 + '=\n' + 'x' * 25 + '\n')
-
     def test_encode_shortest_maxlinelen(self):
         self._test_encode('=' * 5, '=3D=\n' * 4 + '=3D', maxlinelen=4)