[Python-checkins] cpython (merge 3.3 -> default): Merge: PEP8 fixup on previous patch, remove unused imports in test_email.

Fri Mar 8 00:17:48 CET 2013

http://hg.python.org/cpython/rev/9aafc005a611
changeset: 82539:9aafc005a611
parent: 82536:6b69c11b0ad0
parent: 82538:cffc9378b602
user: R David Murray <rdmurray at bitdance.com>
date: Thu Mar 07 18:17:19 2013 -0500
summary:
 Merge: PEP8 fixup on previous patch, remove unused imports in test_email.
files:
 Lib/email/generator.py | 2 +-
 Lib/test/test_email/test_email.py | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Lib/email/generator.py b/Lib/email/generator.py
--- a/Lib/email/generator.py
+++ b/Lib/email/generator.py
@@ -156,7 +156,7 @@
 self.write(self._NL)
 laststripped = lines[-1].rstrip('\r\n')
 self.write(laststripped)
- if len(lines[-1])!=len(laststripped):
+ if len(lines[-1]) != len(laststripped):
 self.write(self._NL)
 
 def _write(self, msg):
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -2,14 +2,10 @@
 # Contact: email-sig at 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,7 +33,7 @@
 from email import base64mime
 from email import quoprimime
 
-from test.support import run_unittest, unlink
+from test.support import unlink
 from test.test_email import openfile, TestEmailBase
 
 NL = '\n'
-- 
Repository URL: http://hg.python.org/cpython
