# HG changeset patch # User Jon Dufresne # Date 1421628468 28800 # Sun Jan 18 16:47:48 2015 -0800 # Node ID 24ee1ec342edd82dbfc3a04be58726be1178d63e # Parent 0f90a3bd07f7d63eed5dceb8199ed24d1228bc48 Remove unused imports diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/ctypes/test/test_objects.py --- a/Lib/ctypes/test/test_objects.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/ctypes/test/test_objects.py Sun Jan 18 16:47:48 2015 -0800 @@ -54,7 +54,7 @@ ''' -import unittest, doctest, sys +import unittest, doctest import ctypes.test.test_objects diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/ctypes/test/test_parameters.py --- a/Lib/ctypes/test/test_parameters.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/ctypes/test/test_parameters.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,4 +1,4 @@ -import unittest, sys +import unittest from ctypes.test import need_symbol class SimpleTypesTestCase(unittest.TestCase): @@ -49,7 +49,7 @@ # XXX Replace by c_char_p tests def test_cstrings(self): - from ctypes import c_char_p, byref + from ctypes import c_char_p # c_char_p.from_param on a Python String packs the string # into a cparam object @@ -68,7 +68,7 @@ @need_symbol('c_wchar_p') def test_cw_strings(self): - from ctypes import byref, c_wchar_p + from ctypes import c_wchar_p c_wchar_p.from_param("123") @@ -98,7 +98,7 @@ def test_byref_pointer(self): # The from_param class method of POINTER(typ) classes accepts what is # returned by byref(obj), it type(obj) == typ - from ctypes import c_short, c_uint, c_int, c_long, pointer, POINTER, byref + from ctypes import c_short, c_uint, c_int, c_long, POINTER, byref LPINT = POINTER(c_int) LPINT.from_param(byref(c_int(42))) diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/ctypes/test/test_returnfuncptrs.py --- a/Lib/ctypes/test/test_returnfuncptrs.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/ctypes/test/test_returnfuncptrs.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,6 +1,5 @@ import unittest from ctypes import * -import os import _ctypes_test diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/ctypes/test/test_sizes.py --- a/Lib/ctypes/test/test_sizes.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/ctypes/test/test_sizes.py Sun Jan 18 16:47:48 2015 -0800 @@ -2,7 +2,6 @@ from ctypes import * -import sys import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/distutils/tests/test_bdist_rpm.py --- a/Lib/distutils/tests/test_bdist_rpm.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/distutils/tests/test_bdist_rpm.py Sun Jan 18 16:47:48 2015 -0800 @@ -3,16 +3,12 @@ import unittest import sys import os -import tempfile -import shutil from test.support import run_unittest from distutils.core import Distribution from distutils.command.bdist_rpm import bdist_rpm from distutils.tests import support from distutils.spawn import find_executable -from distutils import spawn -from distutils.errors import DistutilsExecError SETUP_PY = """\ from distutils.core import setup diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/distutils/tests/test_build_ext.py --- a/Lib/distutils/tests/test_build_ext.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/distutils/tests/test_build_ext.py Sun Jan 18 16:47:48 2015 -0800 @@ -166,7 +166,6 @@ cmd = self.build_ext(dist) cmd.finalize_options() - from distutils import sysconfig py_include = sysconfig.get_python_inc() self.assertIn(py_include, cmd.include_dirs) diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/distutils/tests/test_clean.py --- a/Lib/distutils/tests/test_clean.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/distutils/tests/test_clean.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,8 +1,6 @@ """Tests for distutils.command.clean.""" -import sys import os import unittest -import getpass from distutils.command.clean import clean from distutils.tests import support diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/distutils/tests/test_config.py --- a/Lib/distutils/tests/test_config.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/distutils/tests/test_config.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,8 +1,6 @@ """Tests for distutils.pypirc.pypirc.""" -import sys import os import unittest -import tempfile from distutils.core import PyPIRCCommand from distutils.core import Distribution diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/distutils/tests/test_cygwinccompiler.py --- a/Lib/distutils/tests/test_cygwinccompiler.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/distutils/tests/test_cygwinccompiler.py Sun Jan 18 16:47:48 2015 -0800 @@ -3,11 +3,10 @@ import sys import os from io import BytesIO -import subprocess from test.support import run_unittest from distutils import cygwinccompiler -from distutils.cygwinccompiler import (CygwinCCompiler, check_config_h, +from distutils.cygwinccompiler import (check_config_h, CONFIG_H_OK, CONFIG_H_NOTOK, CONFIG_H_UNCERTAIN, get_versions, get_msvcr) diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/distutils/tests/test_dep_util.py --- a/Lib/distutils/tests/test_dep_util.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/distutils/tests/test_dep_util.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,7 +1,6 @@ """Tests for distutils.dep_util.""" import unittest import os -import time from distutils.dep_util import newer, newer_pairwise, newer_group from distutils.errors import DistutilsFileError diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/distutils/tests/test_file_util.py --- a/Lib/distutils/tests/test_file_util.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/distutils/tests/test_file_util.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,7 +1,6 @@ """Tests for distutils.file_util.""" import unittest import os -import shutil import errno from unittest.mock import patch diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/distutils/tests/test_install_data.py --- a/Lib/distutils/tests/test_install_data.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/distutils/tests/test_install_data.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,8 +1,6 @@ """Tests for distutils.command.install_data.""" -import sys import os import unittest -import getpass from distutils.command.install_data import install_data from distutils.tests import support diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/distutils/tests/test_install_headers.py --- a/Lib/distutils/tests/test_install_headers.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/distutils/tests/test_install_headers.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,8 +1,6 @@ """Tests for distutils.command.install_headers.""" -import sys import os import unittest -import getpass from distutils.command.install_headers import install_headers from distutils.tests import support diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/distutils/tests/test_spawn.py --- a/Lib/distutils/tests/test_spawn.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/distutils/tests/test_spawn.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,11 +1,10 @@ """Tests for distutils.spawn.""" import unittest import os -import time -from test.support import captured_stdout, run_unittest +from test.support import run_unittest from distutils.spawn import _nt_quote_args -from distutils.spawn import spawn, find_executable +from distutils.spawn import spawn from distutils.errors import DistutilsExecError from distutils.tests import support diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/distutils/tests/test_unixccompiler.py --- a/Lib/distutils/tests/test_unixccompiler.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/distutils/tests/test_unixccompiler.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,5 +1,4 @@ """Tests for distutils.unixccompiler.""" -import os import sys import unittest from test.support import EnvironmentVarGuard, run_unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/idlelib/idle_test/test_autocomplete.py --- a/Lib/idlelib/idle_test/test_autocomplete.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/idlelib/idle_test/test_autocomplete.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,6 +1,6 @@ import unittest from test.support import requires -from tkinter import Tk, Text, TclError +from tkinter import Tk, Text import idlelib.AutoComplete as ac import idlelib.AutoCompleteWindow as acw diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/idlelib/idle_test/test_formatparagraph.py --- a/Lib/idlelib/idle_test/test_formatparagraph.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/idlelib/idle_test/test_formatparagraph.py Sun Jan 18 16:47:48 2015 -0800 @@ -2,7 +2,7 @@ import unittest from idlelib import FormatParagraph as fp from idlelib.EditorWindow import EditorWindow -from tkinter import Tk, Text, TclError +from tkinter import Tk, Text from test.support import requires diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/idlelib/idle_test/test_searchdialogbase.py --- a/Lib/idlelib/idle_test/test_searchdialogbase.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/idlelib/idle_test/test_searchdialogbase.py Sun Jan 18 16:47:48 2015 -0800 @@ -6,11 +6,10 @@ ''' import unittest from test.support import requires -from tkinter import Tk, Toplevel, Frame, Label, BooleanVar, StringVar +from tkinter import Tk, Toplevel, Frame from idlelib import SearchEngine as se from idlelib import SearchDialogBase as sdb from idlelib.idle_test.mock_idle import Func -from idlelib.idle_test.mock_tk import Var, Mbox # The following could help make some tests gui-free. # However, they currently make radiobutton tests fail. diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/idlelib/idle_test/test_searchengine.py --- a/Lib/idlelib/idle_test/test_searchengine.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/idlelib/idle_test/test_searchengine.py Sun Jan 18 16:47:48 2015 -0800 @@ -7,7 +7,6 @@ import re import unittest -from test.support import requires from tkinter import BooleanVar, StringVar, TclError # ,Tk, Text import tkinter.messagebox as tkMessageBox from idlelib import SearchEngine as se diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/idlelib/idle_test/test_text.py --- a/Lib/idlelib/idle_test/test_text.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/idlelib/idle_test/test_text.py Sun Jan 18 16:47:48 2015 -0800 @@ -3,7 +3,7 @@ from test.support import requires from _tkinter import TclError -import tkinter as tk + class TextTest(object): diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/lib2to3/tests/test_all_fixers.py --- a/Lib/lib2to3/tests/test_all_fixers.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/lib2to3/tests/test_all_fixers.py Sun Jan 18 16:47:48 2015 -0800 @@ -10,7 +10,6 @@ import test.support # Local imports -from lib2to3 import refactor from . import support diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/lib2to3/tests/test_fixers.py --- a/Lib/lib2to3/tests/test_fixers.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/lib2to3/tests/test_fixers.py Sun Jan 18 16:47:48 2015 -0800 @@ -2,12 +2,11 @@ # Python imports import os -import unittest from itertools import chain from operator import itemgetter # Local imports -from lib2to3 import pygram, pytree, refactor, fixer_util +from lib2to3 import pygram, fixer_util from lib2to3.tests import support diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/lib2to3/tests/test_parser.py --- a/Lib/lib2to3/tests/test_parser.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/lib2to3/tests/test_parser.py Sun Jan 18 16:47:48 2015 -0800 @@ -10,12 +10,11 @@ # Testing imports from . import support -from .support import driver, test_dir +from .support import driver from test.support import verbose # Python imports import os -import sys import unittest import warnings import subprocess diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/lib2to3/tests/test_pytree.py --- a/Lib/lib2to3/tests/test_pytree.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/lib2to3/tests/test_pytree.py Sun Jan 18 16:47:48 2015 -0800 @@ -11,9 +11,6 @@ from __future__ import with_statement -import sys -import warnings - # Testing imports from . import support diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/lib2to3/tests/test_refactor.py --- a/Lib/lib2to3/tests/test_refactor.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/lib2to3/tests/test_refactor.py Sun Jan 18 16:47:48 2015 -0800 @@ -7,18 +7,14 @@ import sys import os import codecs -import operator import io import tempfile import shutil import unittest -import warnings from lib2to3 import refactor, pygram, fixer_base from lib2to3.pgen2 import token -from . import support - TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "data") FIXER_DIR = os.path.join(TEST_DATA_DIR, "fixers") diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/lib2to3/tests/test_util.py --- a/Lib/lib2to3/tests/test_util.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/lib2to3/tests/test_util.py Sun Jan 18 16:47:48 2015 -0800 @@ -3,9 +3,6 @@ # Testing imports from . import support -# Python imports -import os.path - # Local imports from lib2to3.pytree import Node, Leaf from lib2to3 import fixer_util diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/audiotests.py --- a/Lib/test/audiotests.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/audiotests.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,9 +1,8 @@ from test.support import findfile, TESTFN, unlink -import unittest import array import io import pickle -import sys + class UnseekableIO(io.FileIO): def tell(self): diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/make_ssl_certs.py --- a/Lib/test/make_ssl_certs.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/make_ssl_certs.py Sun Jan 18 16:47:48 2015 -0800 @@ -3,7 +3,6 @@ import os import shutil -import sys import tempfile from subprocess import * diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/seq_tests.py --- a/Lib/test/seq_tests.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/seq_tests.py Sun Jan 18 16:47:48 2015 -0800 @@ -305,7 +305,6 @@ self.assertEqual(id(s), id(s*1)) def test_bigrepeat(self): - import sys if sys.maxsize <= 2147483647: x = self.type2test([0]) x *= 2**16 diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test__locale.py --- a/Lib/test/test__locale.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test__locale.py Sun Jan 18 16:47:48 2015 -0800 @@ -4,7 +4,6 @@ except ImportError: nl_langinfo = None -import codecs import locale import sys import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test__osx_support.py --- a/Lib/test/test__osx_support.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test__osx_support.py Sun Jan 18 16:47:48 2015 -0800 @@ -4,7 +4,6 @@ import os import platform -import shutil import stat import sys import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_aifc.py --- a/Lib/test/test_aifc.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_aifc.py Sun Jan 18 16:47:48 2015 -0800 @@ -2,7 +2,6 @@ import unittest from test import audiotests from audioop import byteswap -import os import io import sys import struct diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_array.py --- a/Lib/test/test_array.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_array.py Sun Jan 18 16:47:48 2015 -0800 @@ -7,8 +7,6 @@ import weakref import pickle import operator -import io -import math import struct import sys import warnings diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_asynchat.py --- a/Lib/test/test_asynchat.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_asynchat.py Sun Jan 18 16:47:48 2015 -0800 @@ -12,7 +12,6 @@ import sys import time import unittest -import warnings import unittest.mock try: import threading diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_base64.py --- a/Lib/test/test_base64.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_base64.py Sun Jan 18 16:47:48 2015 -0800 @@ -5,7 +5,6 @@ import os import sys import subprocess -import struct from array import array diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_bigmem.py --- a/Lib/test/test_bigmem.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_bigmem.py Sun Jan 18 16:47:48 2015 -0800 @@ -14,7 +14,6 @@ import unittest import operator import sys -import functools # These tests all use one of the bigmemtest decorators to indicate how much # memory they use and how much memory they need to be even meaningful. The diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_binhex.py --- a/Lib/test/test_binhex.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_binhex.py Sun Jan 18 16:47:48 2015 -0800 @@ -4,7 +4,6 @@ Based on an original test by Roger E. Masse. """ import binhex -import os import unittest from test import support diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_binop.py --- a/Lib/test/test_binop.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_binop.py Sun Jan 18 16:47:48 2015 -0800 @@ -2,7 +2,7 @@ import unittest from test import support -from operator import eq, ne, lt, gt, le, ge +from operator import eq, le def gcd(a, b): """Greatest common divisor using Euclid's algorithm.""" diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_buffer.py --- a/Lib/test/test_buffer.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_buffer.py Sun Jan 18 16:47:48 2015 -0800 @@ -12,10 +12,8 @@ # import unittest -from test import support from itertools import permutations, product from random import randrange, sample, choice -from sysconfig import get_config_var import warnings import sys, array, io from decimal import Decimal diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_codeccallbacks.py --- a/Lib/test/test_codeccallbacks.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_codeccallbacks.py Sun Jan 18 16:47:48 2015 -0800 @@ -4,7 +4,6 @@ import test.support import unicodedata import unittest -import warnings try: import ctypes diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_codecmaps_cn.py --- a/Lib/test/test_codecmaps_cn.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_codecmaps_cn.py Sun Jan 18 16:47:48 2015 -0800 @@ -3,7 +3,6 @@ # Codec mapping tests for PRC encodings # -from test import support from test import multibytecodec_support import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_codecmaps_hk.py --- a/Lib/test/test_codecmaps_hk.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_codecmaps_hk.py Sun Jan 18 16:47:48 2015 -0800 @@ -3,7 +3,6 @@ # Codec mapping tests for HongKong encodings # -from test import support from test import multibytecodec_support import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_codecmaps_kr.py --- a/Lib/test/test_codecmaps_kr.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_codecmaps_kr.py Sun Jan 18 16:47:48 2015 -0800 @@ -3,7 +3,6 @@ # Codec mapping tests for ROK encodings # -from test import support from test import multibytecodec_support import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_codecmaps_tw.py --- a/Lib/test/test_codecmaps_tw.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_codecmaps_tw.py Sun Jan 18 16:47:48 2015 -0800 @@ -3,7 +3,6 @@ # Codec mapping tests for ROC encodings # -from test import support from test import multibytecodec_support import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_codecs.py --- a/Lib/test/test_codecs.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_codecs.py Sun Jan 18 16:47:48 2015 -0800 @@ -4,7 +4,6 @@ import locale import sys import unittest -import warnings import encodings from test import support diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_collections.py --- a/Lib/test/test_collections.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_collections.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,8 +1,6 @@ """Unit tests for collections.py.""" import unittest, doctest, operator -from test.support import TESTFN, forget, unlink -import inspect from test import support from collections import namedtuple, Counter, OrderedDict, _count_elements from test import mapping_tests @@ -1635,7 +1633,7 @@ ### Run tests ################################################################################ -import doctest, collections +import collections def test_main(verbose=None): NamedTupleDocs = doctest.DocTestSuite(module=collections) diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_cprofile.py --- a/Lib/test/test_cprofile.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_cprofile.py Sun Jan 18 16:47:48 2015 -0800 @@ -6,7 +6,7 @@ # rip off all interesting stuff from test_profile import cProfile from test.test_profile import ProfileTest, regenerate_expected_output -from test.profilee import testfunc + class CProfileTest(ProfileTest): profilerclass = cProfile.Profile diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_csv.py --- a/Lib/test/test_csv.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_csv.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,9 +1,7 @@ # Copyright (C) 2001,2002 Python Software Foundation # csv package unit tests -import io import sys -import os import unittest from io import StringIO from tempfile import TemporaryFile @@ -1055,7 +1053,6 @@ "François Pinard"] def test_unicode_read(self): - import io with TemporaryFile("w+", newline='', encoding="utf-8") as fileobj: fileobj.write(",".join(self.names) + "\r\n") fileobj.seek(0) @@ -1064,7 +1061,6 @@ def test_unicode_write(self): - import io with TemporaryFile("w+", newline='', encoding="utf-8") as fileobj: writer = csv.writer(fileobj) writer.writerow(self.names) diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_dbm.py --- a/Lib/test/test_dbm.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_dbm.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,6 +1,5 @@ """Test script for the dbm.open function based on testdumbdbm.py""" -import os import unittest import glob import test.support diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_dbm_gnu.py --- a/Lib/test/test_dbm_gnu.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_dbm_gnu.py Sun Jan 18 16:47:48 2015 -0800 @@ -2,7 +2,7 @@ gdbm = support.import_module("dbm.gnu") #skip if not supported import unittest import os -from test.support import verbose, TESTFN, unlink +from test.support import TESTFN, unlink filename = TESTFN diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_dbm_ndbm.py --- a/Lib/test/test_dbm_ndbm.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_dbm_ndbm.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,8 +1,6 @@ from test import support support.import_module("dbm.ndbm") #skip if not supported import unittest -import os -import random import dbm.ndbm from dbm.ndbm import error diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_devpoll.py --- a/Lib/test/test_devpoll.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_devpoll.py Sun Jan 18 16:47:48 2015 -0800 @@ -5,9 +5,8 @@ import os import random import select -import sys import unittest -from test.support import TESTFN, run_unittest, cpython_only +from test.support import run_unittest, cpython_only if not hasattr(select, 'devpoll') : raise unittest.SkipTest('test works only on Solaris OS family') diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_dictcomps.py --- a/Lib/test/test_dictcomps.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_dictcomps.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,6 +1,5 @@ import unittest -from test import support # For scope testing. g = "Global variable" diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_doctest.py --- a/Lib/test/test_doctest.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_doctest.py Sun Jan 18 16:47:48 2015 -0800 @@ -1876,7 +1876,6 @@ To demonstrate this, we'll create a fake standard input that captures our debugger input: - >>> import tempfile >>> real_stdin = sys.stdin >>> sys.stdin = _FakeInput([ ... 'print(x)', # print data defined by the example @@ -1917,7 +1916,7 @@ ... finally: ... sys.stdin = real_stdin --Return-- - > (3)calls_set_trace()->None + > (3)calls_set_trace()->None -> import pdb; pdb.set_trace() (Pdb) print(y) 2 @@ -2804,7 +2803,6 @@ ... _ = f.write(" 'abc def'\n") ... _ = f.write("\n") ... _ = f.write(' \"\"\"\n') - ... import shutil ... rc1, out1, err1 = script_helper.assert_python_failure( ... '-m', 'doctest', fn, fn2, TERM='') ... rc2, out2, err2 = script_helper.assert_python_ok( @@ -2952,7 +2950,7 @@ from test import test_doctest support.run_doctest(test_doctest, verbosity=True) -import sys, re, io +import sys def test_coverage(coverdir): trace = support.import_module('trace') diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_dynamic.py --- a/Lib/test/test_dynamic.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_dynamic.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,7 +1,6 @@ # Test the most dynamic corner cases of Python's runtime semantics. import builtins -import contextlib import unittest from test.support import run_unittest, swap_item, swap_attr diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_email/test_asian_codecs.py --- a/Lib/test/test_email/test_asian_codecs.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_email/test_asian_codecs.py Sun Jan 18 16:47:48 2015 -0800 @@ -3,7 +3,6 @@ # email package unit tests for (optional) Asian codecs import unittest -from test.support import run_unittest from test.test_email.test_email import TestEmailBase from email.charset import Charset diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_email/test_email.py --- a/Lib/test/test_email/test_email.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_email/test_email.py Sun Jan 18 16:47:48 2015 -0800 @@ -3387,7 +3387,6 @@ class TestFeedParsers(TestEmailBase): def parse(self, chunks): - from email.feedparser import FeedParser feedparser = FeedParser() for chunk in chunks: feedparser.feed(chunk) diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_email/test_headerregistry.py --- a/Lib/test/test_email/test_headerregistry.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_email/test_headerregistry.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,7 +1,6 @@ import datetime import textwrap import unittest -import types from email import errors from email import policy from email.message import Message diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_faulthandler.py --- a/Lib/test/test_faulthandler.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_faulthandler.py Sun Jan 18 16:47:48 2015 -0800 @@ -7,7 +7,6 @@ import subprocess import sys from test import support, script_helper -from test.script_helper import assert_python_ok import tempfile import unittest from textwrap import dedent diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_file.py --- a/Lib/test/test_file.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_file.py Sun Jan 18 16:47:48 2015 -0800 @@ -7,7 +7,7 @@ import io import _pyio as pyio -from test.support import TESTFN, run_unittest +from test.support import TESTFN from collections import UserList class AutoFileTests: diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_fileinput.py --- a/Lib/test/test_fileinput.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_fileinput.py Sun Jan 18 16:47:48 2015 -0800 @@ -22,7 +22,7 @@ from io import BytesIO, StringIO from fileinput import FileInput, hook_encoded -from test.support import verbose, TESTFN, run_unittest, check_warnings +from test.support import verbose, TESTFN, check_warnings from test.support import unlink as safe_unlink from unittest import mock diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_float.py --- a/Lib/test/test_float.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_float.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,9 +1,7 @@ - import unittest, struct import os import sys from test import support -import math from math import isinf, isnan, copysign, ldexp import operator import random, fractions diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_gdb.py --- a/Lib/test/test_gdb.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_gdb.py Sun Jan 18 16:47:48 2015 -0800 @@ -5,7 +5,6 @@ import os import re -import pprint import subprocess import sys import sysconfig diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_getargs2.py --- a/Lib/test/test_getargs2.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_getargs2.py Sun Jan 18 16:47:48 2015 -0800 @@ -251,7 +251,6 @@ @unittest.skipIf(getargs_L is None, 'PY_LONG_LONG is not available') class LongLong_TestCase(unittest.TestCase): def test_L(self): - from _testcapi import getargs_L # L returns 'long long', and does range checking (LLONG_MIN # ... LLONG_MAX) self.assertRaises(TypeError, getargs_L, 3.14) @@ -272,7 +271,6 @@ self.assertRaises(OverflowError, getargs_L, VERY_LARGE) def test_K(self): - from _testcapi import getargs_K # K return 'unsigned long long', no range checking self.assertRaises(TypeError, getargs_K, 3.14) self.assertRaises(TypeError, getargs_K, Int()) diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_gettext.py --- a/Lib/test/test_gettext.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_gettext.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,6 +1,5 @@ import os import base64 -import shutil import gettext import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_heapq.py --- a/Lib/test/test_heapq.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_heapq.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,6 +1,5 @@ """Unittests for heapq.""" -import sys import random import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_html.py --- a/Lib/test/test_html.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_html.py Sun Jan 18 16:47:48 2015 -0800 @@ -4,7 +4,6 @@ import html import unittest -from test.support import run_unittest class HtmlTests(unittest.TestCase): diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_htmlparser.py --- a/Lib/test/test_htmlparser.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_htmlparser.py Sun Jan 18 16:47:48 2015 -0800 @@ -3,7 +3,6 @@ import html.parser import pprint import unittest -from test import support class EventCollector(html.parser.HTMLParser): diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_idle.py --- a/Lib/test/test_idle.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_idle.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,5 +1,4 @@ import unittest -from test import support from test.support import import_module # Skip test if _thread or _tkinter wasn't built or idlelib was deleted. diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_importlib/extension/test_case_sensitivity.py --- a/Lib/test/test_importlib/extension/test_case_sensitivity.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_importlib/extension/test_case_sensitivity.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,5 +1,4 @@ from importlib import _bootstrap -import sys from test import support import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_importlib/extension/test_loader.py --- a/Lib/test/test_importlib/extension/test_loader.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_importlib/extension/test_loader.py Sun Jan 18 16:47:48 2015 -0800 @@ -5,7 +5,6 @@ import os.path import sys -import types import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_importlib/extension/test_path_hook.py --- a/Lib/test/test_importlib/extension/test_path_hook.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_importlib/extension/test_path_hook.py Sun Jan 18 16:47:48 2015 -0800 @@ -2,8 +2,6 @@ machinery = util.import_importlib('importlib.machinery') -import collections -import sys import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_importlib/frozen/test_loader.py --- a/Lib/test/test_importlib/frozen/test_loader.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_importlib/frozen/test_loader.py Sun Jan 18 16:47:48 2015 -0800 @@ -4,7 +4,6 @@ machinery = util.import_importlib('importlib.machinery') -import sys from test.support import captured_stdout import types import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_importlib/import_/test_packages.py --- a/Lib/test/test_importlib/import_/test_packages.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_importlib/import_/test_packages.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,7 +1,6 @@ from .. import util import sys import unittest -import importlib from test import support diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_importlib/import_/test_relative_imports.py --- a/Lib/test/test_importlib/import_/test_relative_imports.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_importlib/import_/test_relative_imports.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,6 +1,5 @@ """Test relative imports (PEP 328).""" from .. import util -import sys import unittest class RelativeImports: diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_importlib/source/test_case_sensitivity.py --- a/Lib/test/test_importlib/source/test_case_sensitivity.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_importlib/source/test_case_sensitivity.py Sun Jan 18 16:47:48 2015 -0800 @@ -5,7 +5,6 @@ machinery = util.import_importlib('importlib.machinery') import os -import sys from test import support as test_support import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_importlib/source/test_source_encoding.py --- a/Lib/test/test_importlib/source/test_source_encoding.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_importlib/source/test_source_encoding.py Sun Jan 18 16:47:48 2015 -0800 @@ -5,7 +5,6 @@ import codecs import importlib.util import re -import sys import types # Because sys.path gets essentially blanked, need to have unicodedata already # imported for the parser to use. diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_importlib/test_locks.py --- a/Lib/test/test_importlib/test_locks.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_importlib/test_locks.py Sun Jan 18 16:47:48 2015 -0800 @@ -3,7 +3,6 @@ init = test_util.import_importlib('importlib') import sys -import time import unittest import weakref diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_importlib/test_namespace_pkgs.py --- a/Lib/test/test_importlib/test_namespace_pkgs.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_importlib/test_namespace_pkgs.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,13 +1,9 @@ import contextlib -import importlib.abc -import importlib.machinery import os import sys -import types import unittest from test.test_importlib import util -from test.support import run_unittest # needed tests: # diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_ioctl.py --- a/Lib/test/test_ioctl.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_ioctl.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,6 +1,6 @@ import array import unittest -from test.support import run_unittest, import_module, get_attribute +from test.support import import_module, get_attribute import os, struct fcntl = import_module('fcntl') termios = import_module('termios') diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_iterlen.py --- a/Lib/test/test_iterlen.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_iterlen.py Sun Jan 18 16:47:48 2015 -0800 @@ -42,7 +42,6 @@ """ import unittest -from test import support from itertools import repeat from collections import deque from operator import length_hint diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_itertools.py --- a/Lib/test/test_itertools.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_itertools.py Sun Jan 18 16:47:48 2015 -0800 @@ -10,7 +10,6 @@ import copy import pickle from functools import reduce -import sys import struct maxsize = support.MAX_Py_ssize_t minsize = -maxsize-1 diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_json/__init__.py --- a/Lib/test/test_json/__init__.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_json/__init__.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,5 +1,4 @@ import os -import sys import json import doctest import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_kqueue.py --- a/Lib/test/test_kqueue.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_kqueue.py Sun Jan 18 16:47:48 2015 -0800 @@ -5,7 +5,6 @@ import os import select import socket -import sys import time import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_macpath.py --- a/Lib/test/test_macpath.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_macpath.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,5 +1,5 @@ import macpath -from test import support, test_genericpath +from test import test_genericpath import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_mailbox.py --- a/Lib/test/test_mailbox.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_mailbox.py Sun Jan 18 16:47:48 2015 -0800 @@ -7,17 +7,12 @@ import email.message import re import io -import shutil import tempfile from test import support import unittest import textwrap import mailbox import glob -try: - import fcntl -except ImportError: - pass class TestBase: diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_mailcap.py --- a/Lib/test/test_mailcap.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_mailcap.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,6 +1,5 @@ import mailcap import os -import shutil import test.support import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_math.py --- a/Lib/test/test_math.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_math.py Sun Jan 18 16:47:48 2015 -0800 @@ -6,7 +6,6 @@ import unittest import math import os -import platform import sys import struct import sysconfig diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_msilib.py --- a/Lib/test/test_msilib.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_msilib.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,6 +1,5 @@ """ Test suite for the code in msilib """ import unittest -import os from test.support import run_unittest, import_module msilib = import_module('msilib') diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_multibytecodec.py --- a/Lib/test/test_multibytecodec.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_multibytecodec.py Sun Jan 18 16:47:48 2015 -0800 @@ -5,7 +5,7 @@ from test import support from test.support import TESTFN -import unittest, io, codecs, sys, os +import unittest, io, codecs, sys import _multibytecodec ALL_CJKENCODINGS = [ diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_multiprocessing_main_handling.py --- a/Lib/test/test_multiprocessing_main_handling.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_multiprocessing_main_handling.py Sun Jan 18 16:47:48 2015 -0800 @@ -6,7 +6,6 @@ import importlib import importlib.machinery -import zipimport import unittest import sys import os @@ -15,8 +14,7 @@ from test.script_helper import ( make_pkg, make_script, make_zip_pkg, make_zip_script, - assert_python_ok, assert_python_failure, temp_dir, - spawn_python, kill_python) + assert_python_ok, temp_dir) # Look up which start methods are available to test import multiprocessing diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_nis.py --- a/Lib/test/test_nis.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_nis.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,6 +1,5 @@ from test import support import unittest -import sys # Skip test if nis module does not exist. nis = support.import_module('nis') diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_normalization.py --- a/Lib/test/test_normalization.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_normalization.py Sun Jan 18 16:47:48 2015 -0800 @@ -3,7 +3,6 @@ from http.client import HTTPException import sys -import os from unicodedata import normalize, unidata_version TESTDATAFILE = "NormalizationTest.txt" diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_osx_env.py --- a/Lib/test/test_osx_env.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_osx_env.py Sun Jan 18 16:47:48 2015 -0800 @@ -2,7 +2,7 @@ Test suite for OS X interpreter environment variables. """ -from test.support import EnvironmentVarGuard, run_unittest +from test.support import EnvironmentVarGuard import subprocess import sys import sysconfig diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_parser.py --- a/Lib/test/test_parser.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_parser.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,6 +1,5 @@ import parser import unittest -import sys import operator import struct from test import support diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_pdb.py --- a/Lib/test/test_pdb.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_pdb.py Sun Jan 18 16:47:48 2015 -0800 @@ -558,7 +558,6 @@ def pdb_invoke(method, arg): """Run pdb.method(arg).""" - import pdb getattr(pdb.Pdb(nosigint=True), method)(arg) diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_pep3151.py --- a/Lib/test/test_pep3151.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_pep3151.py Sun Jan 18 16:47:48 2015 -0800 @@ -2,7 +2,6 @@ import os import select import socket -import sys import unittest import errno from errno import EEXIST diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_pep352.py --- a/Lib/test/test_pep352.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_pep352.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,6 +1,5 @@ import unittest import builtins -import warnings import os from platform import system as platform_system diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_pickletools.py --- a/Lib/test/test_pickletools.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_pickletools.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,4 +1,3 @@ -import struct import pickle import pickletools from test import support diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_plistlib.py --- a/Lib/test/test_plistlib.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_plistlib.py Sun Jan 18 16:47:48 2015 -0800 @@ -7,7 +7,6 @@ import codecs import binascii import collections -import struct from test import support from io import BytesIO diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_poplib.py --- a/Lib/test/test_poplib.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_poplib.py Sun Jan 18 16:47:48 2015 -0800 @@ -8,7 +8,6 @@ import asynchat import socket import os -import time import errno from unittest import TestCase, skipUnless diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_posix.py --- a/Lib/test/test_posix.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_posix.py Sun Jan 18 16:47:48 2015 -0800 @@ -11,7 +11,6 @@ import os import platform import pwd -import shutil import stat import tempfile import unittest diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_posixpath.py --- a/Lib/test/test_posixpath.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_posixpath.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,7 +1,5 @@ -import itertools import os import posixpath -import sys import unittest import warnings from posixpath import realpath, abspath, dirname, basename diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_pulldom.py --- a/Lib/test/test_pulldom.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_pulldom.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,6 +1,5 @@ import io import unittest -import sys import xml.sax from xml.sax.xmlreader import AttributesImpl diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_quopri.py --- a/Lib/test/test_quopri.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_quopri.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,7 +1,7 @@ from test import support import unittest -import sys, os, io, subprocess +import sys, io, subprocess import quopri diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_regrtest.py --- a/Lib/test/test_regrtest.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_regrtest.py Sun Jan 18 16:47:48 2015 -0800 @@ -2,9 +2,7 @@ Tests of regrtest.py. """ -import argparse import faulthandler -import getopt import os.path import unittest from test import regrtest, support diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_robotparser.py --- a/Lib/test/test_robotparser.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_robotparser.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,8 +1,6 @@ import io import unittest import urllib.robotparser -from urllib.error import URLError, HTTPError -from urllib.request import urlopen from test import support from http.server import BaseHTTPRequestHandler, HTTPServer try: diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_sched.py --- a/Lib/test/test_sched.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_sched.py Sun Jan 18 16:47:48 2015 -0800 @@ -2,7 +2,6 @@ import sched import time import unittest -from test import support try: import threading except ImportError: diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_set.py --- a/Lib/test/test_set.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_set.py Sun Jan 18 16:47:48 2015 -0800 @@ -6,7 +6,6 @@ import copy import pickle from random import randrange, shuffle -import sys import warnings import collections import collections.abc diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_smtplib.py --- a/Lib/test/test_smtplib.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_smtplib.py Sun Jan 18 16:47:48 2015 -0800 @@ -10,7 +10,6 @@ import time import select import errno -import base64 import unittest from test import support, mock_socket diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_socket.py --- a/Lib/test/test_socket.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_socket.py Sun Jan 18 16:47:48 2015 -0800 @@ -13,7 +13,6 @@ import sys import os import array -import platform import contextlib from weakref import proxy import signal diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_socketserver.py --- a/Lib/test/test_socketserver.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_socketserver.py Sun Jan 18 16:47:48 2015 -0800 @@ -8,8 +8,6 @@ import select import signal import socket -import select -import errno import tempfile import unittest import socketserver diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_statistics.py --- a/Lib/test/test_statistics.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_statistics.py Sun Jan 18 16:47:48 2015 -0800 @@ -9,7 +9,6 @@ import math import random import sys -import types import unittest from decimal import Decimal diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_strptime.py --- a/Lib/test/test_strptime.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_strptime.py Sun Jan 18 16:47:48 2015 -0800 @@ -4,7 +4,6 @@ import time import locale import re -import sys from test import support from datetime import date as datetime_date diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_subprocess.py Sun Jan 18 16:47:48 2015 -0800 @@ -5,15 +5,12 @@ import sys import signal import io -import locale import os import errno import tempfile import time -import re import selectors import sysconfig -import warnings import select import shutil import gc diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_sunau.py --- a/Lib/test/test_sunau.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_sunau.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,4 +1,3 @@ -from test.support import TESTFN import unittest from test import audiotests from audioop import byteswap diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_telnetlib.py --- a/Lib/test/test_telnetlib.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_telnetlib.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,7 +1,6 @@ import socket import selectors import telnetlib -import time import contextlib from unittest import TestCase diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_threading.py --- a/Lib/test/test_threading.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_threading.py Sun Jan 18 16:47:48 2015 -0800 @@ -3,7 +3,7 @@ """ import test.support -from test.support import verbose, strip_python_stderr, import_module, cpython_only +from test.support import verbose, import_module, cpython_only from test.script_helper import assert_python_ok, assert_python_failure import random diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_tools/test_gprof2html.py --- a/Lib/test/test_tools/test_gprof2html.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_tools/test_gprof2html.py Sun Jan 18 16:47:48 2015 -0800 @@ -2,12 +2,11 @@ import os import sys -import importlib import unittest from unittest import mock import tempfile -from test.test_tools import scriptsdir, skip_if_missing, import_tool +from test.test_tools import skip_if_missing, import_tool skip_if_missing() diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_tools/test_md5sum.py --- a/Lib/test/test_tools/test_md5sum.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_tools/test_md5sum.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,12 +1,11 @@ """Tests for the md5sum script in the Tools directory.""" import os -import sys import unittest from test import support from test.script_helper import assert_python_ok, assert_python_failure -from test.test_tools import scriptsdir, import_tool, skip_if_missing +from test.test_tools import scriptsdir, skip_if_missing skip_if_missing() diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_tools/test_pdeps.py --- a/Lib/test/test_tools/test_pdeps.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_tools/test_pdeps.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,12 +1,10 @@ """Tests for the pdeps script in the Tools directory.""" import os -import sys import unittest import tempfile -from test import support -from test.test_tools import scriptsdir, skip_if_missing, import_tool +from test.test_tools import skip_if_missing, import_tool skip_if_missing() diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_trace.py --- a/Lib/test/test_trace.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_trace.py Sun Jan 18 16:47:48 2015 -0800 @@ -6,7 +6,7 @@ import unittest import trace -from trace import CoverageResults, Trace +from trace import Trace from test.tracedmodules import testmod diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_ttk_guionly.py --- a/Lib/test/test_ttk_guionly.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_ttk_guionly.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,4 +1,3 @@ -import os import unittest from test import support diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_ttk_textonly.py --- a/Lib/test/test_ttk_textonly.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_ttk_textonly.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,4 +1,3 @@ -import os from test import support # Skip this test if _tkinter does not exist. diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_unpack_ex.py --- a/Lib/test/test_unpack_ex.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_unpack_ex.py Sun Jan 18 16:47:48 2015 -0800 @@ -165,7 +165,6 @@ __test__ = {'doctests' : doctests} def test_main(verbose=False): - import sys from test import support from test import test_unpack_ex support.run_doctest(test_unpack_ex, verbose) diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_urllib2.py --- a/Lib/test/test_urllib2.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_urllib2.py Sun Jan 18 16:47:48 2015 -0800 @@ -423,7 +423,7 @@ self._count = 0 self.requests = [] def http_open(self, req): - import email, http.client, copy + import email, copy self.requests.append(copy.deepcopy(req)) if self._count == 0: self._count = self._count + 1 diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_userstring.py --- a/Lib/test/test_userstring.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_userstring.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,9 +1,8 @@ # UserString is a wrapper around the native builtin string type. # UserString instances should behave similar to builtin string objects. -import string import unittest -from test import support, string_tests +from test import string_tests from collections import UserString diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_uu.py --- a/Lib/test/test_uu.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_uu.py Sun Jan 18 16:47:48 2015 -0800 @@ -8,7 +8,6 @@ import sys, os import uu -from io import BytesIO import io plaintext = b"The smooth-scaled python crept over the sleeping dog\n" diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_venv.py --- a/Lib/test/test_venv.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_venv.py Sun Jan 18 16:47:48 2015 -0800 @@ -14,7 +14,6 @@ import tempfile from test.support import (captured_stdout, captured_stderr, run_unittest, can_symlink, EnvironmentVarGuard, rmtree) -import textwrap import unittest import venv diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_wave.py --- a/Lib/test/test_wave.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_wave.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,4 +1,3 @@ -from test.support import TESTFN import unittest from test import audiotests from audioop import byteswap diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_weakset.py --- a/Lib/test/test_weakset.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_weakset.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,14 +1,7 @@ import unittest from test import support -from weakref import proxy, ref, WeakSet -import operator -import copy +from weakref import WeakSet import string -import os -from random import randrange, shuffle -import sys -import warnings -import collections from collections import UserString as ustr import gc import contextlib diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_wsgiref.py --- a/Lib/test/test_wsgiref.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_wsgiref.py Sun Jan 18 16:47:48 2015 -0800 @@ -5,7 +5,7 @@ from wsgiref.handlers import BaseHandler, BaseCGIHandler from wsgiref import util from wsgiref.validate import validator -from wsgiref.simple_server import WSGIServer, WSGIRequestHandler, demo_app +from wsgiref.simple_server import WSGIServer, WSGIRequestHandler from wsgiref.simple_server import make_server from io import StringIO, BytesIO, BufferedReader from socketserver import BaseServer diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_xml_etree_c.py --- a/Lib/test/test_xml_etree_c.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_xml_etree_c.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,5 +1,5 @@ # xml.etree test for cElementTree -import sys, struct +import struct from test import support from test.support import import_fresh_module import types @@ -76,7 +76,7 @@ struct.calcsize('8P')) def test_main(): - from test import test_xml_etree, test_xml_etree_c + from test import test_xml_etree # Run the tests specific to the C implementation support.run_unittest( diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_xmlrpc.py --- a/Lib/test/test_xmlrpc.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_xmlrpc.py Sun Jan 18 16:47:48 2015 -0800 @@ -8,7 +8,6 @@ import xmlrpc.server import http.client import socket -import os import re import io import contextlib @@ -1029,7 +1028,6 @@ """A variation on support.captured_stdout() which gives a text stream having a `buffer` attribute. """ - import io orig_stdout = sys.stdout sys.stdout = io.TextIOWrapper(io.BytesIO(), encoding=encoding) try: diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_xmlrpc_net.py --- a/Lib/test/test_xmlrpc_net.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_xmlrpc_net.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,7 +1,4 @@ import collections.abc -import errno -import socket -import sys import unittest from test import support diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_zipfile.py --- a/Lib/test/test_zipfile.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_zipfile.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,7 +1,6 @@ import contextlib import io import os -import sys import importlib.util import time import struct diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_zipimport_support.py --- a/Lib/test/test_zipimport_support.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_zipimport_support.py Sun Jan 18 16:47:48 2015 -0800 @@ -12,7 +12,6 @@ import doctest import inspect import linecache -import pdb import unittest from test.script_helper import (spawn_python, kill_python, assert_python_ok, temp_dir, make_script, make_zip_script) diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/test/test_zlib.py --- a/Lib/test/test_zlib.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/test/test_zlib.py Sun Jan 18 16:47:48 2015 -0800 @@ -2,7 +2,6 @@ from test import support import binascii import random -import sys from test.support import bigmemtest, _1G, _4G zlib = support.import_module('zlib') diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/tkinter/test/runtktests.py --- a/Lib/tkinter/test/runtktests.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/tkinter/test/runtktests.py Sun Jan 18 16:47:48 2015 -0800 @@ -7,8 +7,6 @@ """ import os -import sys -import unittest import importlib import test.support diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/tkinter/test/support.py --- a/Lib/tkinter/test/support.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/tkinter/test/support.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,7 +1,6 @@ -import sys import tkinter import unittest -from test.support import requires + class AbstractTkTest: diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/tkinter/test/test_tkinter/test_widgets.py --- a/Lib/tkinter/test/test_tkinter/test_widgets.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/tkinter/test/test_tkinter/test_widgets.py Sun Jan 18 16:47:48 2015 -0800 @@ -9,8 +9,7 @@ get_tk_patchlevel, widget_eq) from tkinter.test.widget_tests import ( add_standard_options, noconv, pixels_round, - AbstractWidgetTest, StandardOptionsTests, IntegerSizeTests, PixelSizeTests, - setUpModule) + AbstractWidgetTest, StandardOptionsTests, IntegerSizeTests, PixelSizeTests) requires('gui') diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/tkinter/test/test_ttk/test_functions.py --- a/Lib/tkinter/test/test_ttk/test_functions.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/tkinter/test/test_ttk/test_functions.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,6 +1,5 @@ # -*- encoding: utf-8 -*- import unittest -import tkinter from tkinter import ttk class MockTkApp: diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/tkinter/test/test_ttk/test_widgets.py --- a/Lib/tkinter/test/test_ttk/test_widgets.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/tkinter/test/test_ttk/test_widgets.py Sun Jan 18 16:47:48 2015 -0800 @@ -8,8 +8,7 @@ from tkinter.test.support import (AbstractTkTest, tcl_version, get_tk_patchlevel, simulate_mouse_click) from tkinter.test.widget_tests import (add_standard_options, noconv, - AbstractWidgetTest, StandardOptionsTests, IntegerSizeTests, PixelSizeTests, - setUpModule) + AbstractWidgetTest, StandardOptionsTests, IntegerSizeTests, PixelSizeTests) requires('gui') diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/unittest/test/testmock/testmagicmethods.py --- a/Lib/unittest/test/testmock/testmagicmethods.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/unittest/test/testmock/testmagicmethods.py Sun Jan 18 16:47:48 2015 -0800 @@ -1,5 +1,4 @@ import unittest -import inspect import sys from unittest.mock import Mock, MagicMock, _magics diff -r 0f90a3bd07f7 -r 24ee1ec342ed Lib/unittest/test/testmock/testpatch.py --- a/Lib/unittest/test/testmock/testpatch.py Sun Jan 18 13:12:42 2015 -0800 +++ b/Lib/unittest/test/testmock/testpatch.py Sun Jan 18 16:47:48 2015 -0800 @@ -10,9 +10,9 @@ from unittest.test.testmock.support import SomeClass, is_instance from unittest.mock import ( - NonCallableMock, CallableMixin, patch, sentinel, + NonCallableMock, CallableMixin, sentinel, MagicMock, Mock, NonCallableMagicMock, patch, _patch, - DEFAULT, call, _get_target, _patch + DEFAULT, call, _get_target ) diff -r 0f90a3bd07f7 -r 24ee1ec342ed PC/testpy.py --- a/PC/testpy.py Sun Jan 18 13:12:42 2015 -0800 +++ b/PC/testpy.py Sun Jan 18 16:47:48 2015 -0800 @@ -18,8 +18,6 @@ a PC, you should add the dos_8x3 directory to your PYTHONPATH.""") sys.exit(1) -import os - for dir in sys.path: file = os.path.join(dir, "os.py") if os.path.isfile(file):