diff -r 13be42829771 Lib/idlelib/run.py --- a/Lib/idlelib/run.py Wed Oct 28 03:15:38 2015 -0400 +++ b/Lib/idlelib/run.py Thu Oct 29 18:23:10 2015 +1100 @@ -178,7 +178,6 @@ root.destroy() def print_exception(): - import linecache linecache.checkcache() flush_stdout() efile = sys.stderr diff -r 13be42829771 Lib/test/test_email/test_email.py --- a/Lib/test/test_email/test_email.py Wed Oct 28 03:15:38 2015 -0400 +++ b/Lib/test/test_email/test_email.py Thu Oct 29 18:23:10 2015 +1100 @@ -20,6 +20,7 @@ import email.policy from email.charset import Charset +from email import charset as CharsetModule from email.header import Header, decode_header, make_header from email.parser import Parser, HeaderParser from email.generator import Generator, DecodedGenerator, BytesGenerator @@ -44,6 +45,7 @@ # These imports are documented to work, but we are testing them using a # different path, so we import them here just to make sure they are importable. from email.parser import FeedParser, BytesFeedParser +from email.feedparser import BufferedSubFile, NeedMoreData NL = '\n' EMPTYSTRING = '' @@ -3384,7 +3386,6 @@ ("\nf", 1), ("\r\n", 1), ] - from email.feedparser import BufferedSubFile, NeedMoreData bsf = BufferedSubFile() om = [] nt = 0 @@ -3400,8 +3401,6 @@ self.assertEqual(''.join([il for il, n in imt]), ''.join(om)) def test_push_random(self): - from email.feedparser import BufferedSubFile, NeedMoreData - n = 10000 chunksize = 5 chars = 'abcd \t\r\n' @@ -3421,7 +3420,6 @@ class TestFeedParsers(TestEmailBase): def parse(self, chunks): - from email.feedparser import FeedParser feedparser = FeedParser() for chunk in chunks: feedparser.feed(chunk) @@ -4490,7 +4488,6 @@ # Test the Charset class class TestCharset(unittest.TestCase): def tearDown(self): - from email import charset as CharsetModule try: del CharsetModule.CHARSETS['fake'] except KeyError: @@ -4533,7 +4530,6 @@ # Testing SF bug #625509, which we have to fake, since there are no # built-in encodings where the header encoding is QP but the body # encoding is not. - from email import charset as CharsetModule CharsetModule.add_charset('fake', CharsetModule.QP, None, 'utf-8') c = Charset('fake') eq('hello world', c.body_encode('hello world')) @@ -5304,7 +5300,6 @@ def _signed_parts_eq(self, original, result): # Extract the first mime part of each message - import re repart = re.compile(r'^--([^\n]+)\n(.*?)\n--\1$', re.S | re.M) inpart = repart.search(original).group(2) outpart = repart.search(result).group(2) diff -r 13be42829771 Lib/test/test_pprint.py --- a/Lib/test/test_pprint.py Wed Oct 28 03:15:38 2015 -0400 +++ b/Lib/test/test_pprint.py Thu Oct 29 18:23:10 2015 +1100 @@ -961,7 +961,7 @@ 'quick': 1, 'the': 0}""") - def test_user_dict(self): + def test_user_list(self): d = collections.UserList() self.assertEqual(pprint.pformat(d, width=1), "[]") words = 'the quick brown fox jumped over a lazy dog'.split()