summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-03-07 23:17:19 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-03-07 23:17:19 (GMT)
commit857b24b0d50dbcca76c9373f904693dacfda4062 (patch)
treeff83482dd63616c19f653898eaf3cdf7773ef21d
parent2e78cd9b5ed8a27a38920879b6d3e34d06baa8a3 (diff)
parent965794ed5893882b5b0e49ce17ef9e137cfa9db1 (diff)
downloadcpython-857b24b0d50dbcca76c9373f904693dacfda4062.zip
cpython-857b24b0d50dbcca76c9373f904693dacfda4062.tar.gz
cpython-857b24b0d50dbcca76c9373f904693dacfda4062.tar.bz2
Merge: PEP8 fixup on previous patch, remove unused imports in test_email.
-rw-r--r--Lib/email/generator.py2
-rw-r--r--Lib/test/test_email/test_email.py6
2 files changed, 2 insertions, 6 deletions
diff --git a/Lib/email/generator.py b/Lib/email/generator.py
index 27dd0db..24f2abf 100644
--- a/Lib/email/generator.py
+++ b/Lib/email/generator.py
@@ -156,7 +156,7 @@ class Generator:
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
index dd54a1c..23f062f 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -2,14 +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,7 +33,7 @@ from email import iterators
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'