From: R David Murray <rdmurray@bitdance.com>
Date: Thu, 7 Mar 2013 23:16:47 +0000 (-0500)
Subject: Merge: PEP8 fixup on previous patch, remove unused imports in test_email.
X-Git-Tag: v3.3.1rc1~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=965794ed5893882b5b0e49ce17ef9e137cfa9db1;p=thirdparty%2FPython%2Fcpython.git

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

965794ed5893882b5b0e49ce17ef9e137cfa9db1
diff --cc Lib/test/test_email/test_email.py
index dd54a1cd32a8,a1ceb7f1b54c..23f062fd80dd
--- a/Lib/test/test_email/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 = ''