diff options
| author | R David Murray <rdmurray@bitdance.com> | 2013-03-07 18:17:19 -0500 |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2013-03-07 18:17:19 -0500 |
| commit | 857b24b0d50dbcca76c9373f904693dacfda4062 (patch) | |
| tree | ff83482dd63616c19f653898eaf3cdf7773ef21d | |
| parent | 2e78cd9b5ed8a27a38920879b6d3e34d06baa8a3 (diff) | |
| parent | 965794ed5893882b5b0e49ce17ef9e137cfa9db1 (diff) | |
| download | cpython-git-857b24b0d50dbcca76c9373f904693dacfda4062.tar.gz | |
Merge: PEP8 fixup on previous patch, remove unused imports in test_email.
| -rw-r--r-- | Lib/email/generator.py | 2 | ||||
| -rw-r--r-- | 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 index 27dd0db3c1..24f2abf210 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 dd54a1cd32..23f062fd80 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' |