Merge: PEP8 fixup on previous patch, remove unused imports in test_email.

diff --cc Lib/email/generator.py
Simple merge

diff --cc Lib/test/test_email/test_email.py
index dd54a1cd32a8c6e2835a2716cd404d8df1be4ec0,a1ceb7f1b54cd1e0c4f3bb9ae5c512522a1dacbd..23f062fd80ddf8fa365ac5ff00a4c128c7dd575e
--- 1/Lib/test/test_email/test_email.py
--- 2/Lib/email/test/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@@ -2,14 -2,13 +2,10 @@@
  # Contact: email-sig@python.org
  # email package unit tests
  
--import os
  import re
--import sys
  import time
  import base64
--import difflib
  import unittest
- import warnings
  import textwrap
  
  from io import StringIO, BytesIO
@@@ -37,8 -35,9 +33,8 @@@ from email import iterator
  from email import base64mime
  from email import quoprimime
  
- from test.support import run_unittest, unlink
 -from test.support import findfile, run_unittest, unlink
 -from email.test import __file__ as landmark
 -
++from test.support import unlink
 +from test.test_email import openfile, TestEmailBase
  
  NL = '\n'
  EMPTYSTRING = ''