Remove unused imports in test modules.

This commit is contained in:
Georg Brandl 2010-02-07 17:03:15 +00:00
parent dc3694bee0
commit a4f46e1292
74 changed files with 40 additions and 135 deletions

View file

@ -149,7 +149,6 @@ option '-uall,-bsddb'.
import cStringIO
import getopt
import itertools
import json
import os
import random
@ -448,8 +447,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
if use_mp:
from threading import Thread
from Queue import Queue, Empty
from subprocess import Popen, PIPE, STDOUT
from Queue import Queue
from subprocess import Popen, PIPE
from collections import deque
debug_output_pat = re.compile(r"\[\d+ refs\]$")
pending = deque()

View file

@ -1,4 +1,4 @@
from test.test_support import verbose, run_unittest
from test.test_support import run_unittest
from _locale import (setlocale, LC_NUMERIC, localeconv, Error)
try:
from _locale import (RADIXCHAR, THOUSEP, nl_langinfo)

View file

@ -1,10 +1,8 @@
"""Unit tests for numbers.py."""
import math
import operator
import unittest
from numbers import Complex, Real, Rational, Integral
from numbers import Number
from test import test_support
class TestNumbers(unittest.TestCase):

View file

@ -7,9 +7,7 @@ import struct
MacOS = test_support.import_module('MacOS')
# The following should exist if MacOS does.
import macostools
import applesingle
import Carbon.File
AS_MAGIC=0x00051600
AS_VERSION=0x00020000

View file

@ -3,7 +3,6 @@
Adapted to unittest format and expanded scope by Raymond Hettinger
"""
import os, sys
import copy
import unittest
from test import test_support

View file

@ -1,12 +1,12 @@
# Python test set -- built-in functions
import platform
import test.test_support, unittest
import unittest
from test.test_support import fcmp, have_unicode, TESTFN, unlink, \
run_unittest, run_with_locale
run_unittest
from operator import neg
import sys, warnings, cStringIO, random, fractions, UserDict
import sys, warnings, cStringIO, random, UserDict
warnings.filterwarnings("ignore", "hex../oct.. of negative int",
FutureWarning, __name__)
warnings.filterwarnings("ignore", "integer argument expected",

View file

@ -1,7 +1,6 @@
from test.test_support import run_unittest
from test.test_math import parse_testfile, test_file
import unittest
import os, sys
import cmath, math
from cmath import phase, polar, rect, pi

View file

@ -2,7 +2,6 @@
# All tests are executed with environment variables ignored
# See test_cmd_line_script.py for testing of script execution
import os
import test.test_support, unittest
import sys
from test.script_helper import spawn_python, kill_python, python_exit_code

View file

@ -3,9 +3,8 @@
import unittest
import os
import os.path
import sys
import test.test_support
from test.script_helper import (spawn_python, kill_python, run_python,
from test.script_helper import (run_python,
temp_dir, make_script, compile_script,
make_pkg, make_zip_script, make_zip_pkg)

View file

@ -6,7 +6,6 @@ from collections import namedtuple, Counter, OrderedDict
from test import mapping_tests
import pickle, cPickle, copy
from random import randrange, shuffle
import operator
import keyword
import re
from collections import Hashable, Iterable, Iterator
@ -848,7 +847,7 @@ class SubclassMappingTests(mapping_tests.BasicTestMappingProtocol):
d = self._empty_mapping()
self.assertRaises(KeyError, d.popitem)
import doctest, collections
import collections
def test_main(verbose=None):
NamedTupleDocs = doctest.DocTestSuite(module=collections)

View file

@ -12,8 +12,7 @@ warnings.filterwarnings('ignore', r".*commands.getstatus.. is deprecated",
from test.test_support import run_unittest, reap_children, import_module
# Silence Py3k warning
import_module('commands', deprecated=True)
from commands import *
commands = import_module('commands', deprecated=True)
# The module says:
# "NB This only works (and is only relevant) for UNIX."
@ -28,8 +27,8 @@ if os.name != 'posix':
class CommandTests(unittest.TestCase):
def test_getoutput(self):
self.assertEquals(getoutput('echo xyzzy'), 'xyzzy')
self.assertEquals(getstatusoutput('echo xyzzy'), (0, 'xyzzy'))
self.assertEquals(commands.getoutput('echo xyzzy'), 'xyzzy')
self.assertEquals(commands.getstatusoutput('echo xyzzy'), (0, 'xyzzy'))
# we use mkdtemp in the next line to create an empty directory
# under our exclusive control; from that, we can invent a pathname
@ -39,7 +38,7 @@ class CommandTests(unittest.TestCase):
dir = tempfile.mkdtemp()
name = os.path.join(dir, "foo")
status, output = getstatusoutput('cat ' + name)
status, output = commands.getstatusoutput('cat ' + name)
self.assertNotEquals(status, 0)
finally:
if dir is not None:
@ -60,7 +59,7 @@ class CommandTests(unittest.TestCase):
/\. # and end with the name of the file.
'''
self.assertTrue(re.match(pat, getstatus("/."), re.VERBOSE))
self.assertTrue(re.match(pat, commands.getstatus("/."), re.VERBOSE))
def test_main():

View file

@ -4,9 +4,7 @@ import os
import py_compile
import shutil
import struct
import sys
import tempfile
import time
from test import test_support
import unittest

View file

@ -1,9 +1,7 @@
"""Unit tests for contextlib.py, and other context managers."""
import sys
import os
import decimal
import tempfile
import unittest
import threading
@ -147,7 +145,6 @@ class NestedTestCase(unittest.TestCase):
self.fail("Didn't raise ZeroDivisionError")
def test_nested_right_exception(self):
state = []
@contextmanager
def a():
yield 1

View file

@ -1722,7 +1722,6 @@ class LWPCookieTests(TestCase):
def test_main(verbose=None):
from test import test_sets
test_support.run_unittest(
DateTimeTests,
HeaderTests,

View file

@ -3,7 +3,6 @@
import copy
import copy_reg
import weakref
import operator
import unittest
from test import test_support

View file

@ -24,7 +24,6 @@ you're working through IDLE, you can import this test module and call test_main(
with the corresponding argument.
"""
import glob
import math
import os, sys
import pickle, copy

View file

@ -6,7 +6,6 @@ import weakref
import copy
import cPickle as pickle
import random
import os
BIG = 100000

View file

@ -261,7 +261,6 @@ class OperatorsTest(unittest.TestCase):
pass
else:
self.fail("NotImplemented should have caused TypeError")
import sys
try:
C(sys.maxint+1)
except OverflowError:
@ -654,7 +653,6 @@ class ClassPropertiesAndMethods(unittest.TestCase):
def test_module_subclasses(self):
# Testing Python subclass of module...
log = []
import types, sys
MT = type(sys)
class MM(MT):
def __init__(self, name):
@ -1131,7 +1129,6 @@ order (MRO) for bases """
# Test cyclical leaks [SF bug 519621]
class F(object):
__slots__ = ['a', 'b']
log = []
s = F()
s.a = [Counted(), s]
self.assertEqual(Counted.counter, 1)
@ -1140,7 +1137,7 @@ order (MRO) for bases """
self.assertEqual(Counted.counter, 0)
# Test lookup leaks [SF bug 572567]
import sys,gc
import gc
if hasattr(gc, 'get_objects'):
class G(object):
def __cmp__(self, other):
@ -1945,7 +1942,6 @@ order (MRO) for bases """
return 'EPS'
return self
# sys.stdout needs to be the original to trigger the recursion bug
import sys
test_stdout = sys.stdout
sys.stdout = test_support.get_original_stdout()
try:
@ -2309,7 +2305,6 @@ order (MRO) for bases """
self.assertIn('im_self', dir(a.Amethod))
# Try a module subclass.
import sys
class M(type(sys)):
pass
minstance = M("m")
@ -3506,7 +3501,6 @@ order (MRO) for bases """
self.fail("d.foo should be undefined now")
# Test a nasty bug in recurse_down_subclasses()
import gc
class A(object):
pass
class B(A):
@ -4327,7 +4321,6 @@ order (MRO) for bases """
def test_file_fault(self):
# Testing sys.stdout is changed in getattr...
import sys
test_stdout = sys.stdout
class StdoutGuard:
def __getattr__(self, attr):
@ -4416,8 +4409,6 @@ order (MRO) for bases """
def test_not_implemented(self):
# Testing NotImplemented...
# all binary methods should be able to return a NotImplemented
import sys
import types
import operator
def specialmethod(self, other):

View file

@ -4,7 +4,7 @@
"""
import unittest
from test.test_support import run_unittest, TESTFN, import_module
from test.test_support import run_unittest, import_module
dircache = import_module('dircache', deprecated=True)
import os, time, sys, tempfile

View file

@ -5,7 +5,6 @@ import threading
import time
import socket
import unittest
import xmlrpclib
PORT = None

View file

@ -21,12 +21,10 @@
"""
Tests for epoll wrapper.
"""
import os
import socket
import errno
import time
import select
import tempfile
import unittest
from test import test_support

View file

@ -12,7 +12,7 @@ from weakref import proxy
import io
import _pyio as pyio
from test.test_support import TESTFN, findfile, run_unittest
from test.test_support import TESTFN, run_unittest
from UserList import UserList
class AutoFileTests(unittest.TestCase):

View file

@ -8,7 +8,7 @@ from array import array
from weakref import proxy
from test import test_support
from test.test_support import TESTFN, findfile, run_unittest
from test.test_support import TESTFN, run_unittest
from UserList import UserList
class AutoFileTests(unittest.TestCase):

View file

@ -1,5 +1,5 @@
import os, filecmp, shutil, tempfile, shutil
import os, filecmp, shutil, tempfile
import unittest
from test import test_support

View file

@ -10,8 +10,7 @@ from array import array
from weakref import proxy
from functools import wraps
from test.test_support import (TESTFN, findfile, check_warnings, run_unittest,
make_bad_fd)
from test.test_support import TESTFN, check_warnings, run_unittest, make_bad_fd
from test.test_support import py3k_bytes as bytes
from _io import FileIO as _FileIO

View file

@ -523,7 +523,6 @@ class IEEEFormatTestCase(unittest.TestCase):
if float.__getformat__("double").startswith("IEEE"):
def test_negative_zero(self):
import math
def pos_pos():
return 0.0, math.atan2(0.0, -1)
def pos_neg():
@ -537,7 +536,6 @@ class IEEEFormatTestCase(unittest.TestCase):
if float.__getformat__("double").startswith("IEEE"):
def test_underflow_sign(self):
import math
# check that -1e-1000 gives -0.0, not 0.0
self.assertEquals(math.atan2(-1e-1000, -1), math.atan2(-0.0, -1))
self.assertEquals(math.atan2(float('-1e-1000'), -1),

View file

@ -1,7 +1,6 @@
"""This test checks for correct fork() behavior.
"""
import errno
import imp
import os
import signal

View file

@ -2,7 +2,7 @@
from test.test_support import captured_stdout, run_unittest
import unittest
import sys, os
import sys
class FrozenTests(unittest.TestCase):
def test_frozen(self):

View file

@ -2,7 +2,6 @@ import test.test_support, unittest
# we're testing the behavior of these future builtins:
from future_builtins import hex, oct, map, zip, filter
from test import test_support
class BuiltinTest(unittest.TestCase):
def test_hex(self):

View file

@ -1,7 +1,6 @@
import unittest
import os
from test.test_support import (verbose, TESTFN, run_unittest, unlink,
import_module)
from test.test_support import TESTFN, run_unittest, unlink, import_module
gdbm = import_module('gdbm')

View file

@ -5,7 +5,6 @@ from test.test_support import verbose, run_doctest, run_unittest, EnvironmentVar
import unittest
import getopt
import os
sentinel = object()

View file

@ -8,7 +8,6 @@
import array
import hashlib
import StringIO
import itertools
import sys
try:

View file

@ -367,8 +367,6 @@ class TestErrorHandling(unittest.TestCase):
def test_main(verbose=None):
from types import BuiltinFunctionType
test_classes = [TestHeapPython, TestHeapC, TestErrorHandling]
test_support.run_unittest(*test_classes)

View file

@ -7,10 +7,7 @@ threading = support.import_module('threading')
from contextlib import contextmanager
import imaplib
import os.path
import select
import socket
import SocketServer
import sys
import time
from test_support import reap_threads, verbose

View file

@ -4,7 +4,7 @@ import unittest
import inspect
import datetime
from test.test_support import TESTFN, run_unittest
from test.test_support import run_unittest
from test import inspect_fodder as mod
from test import inspect_fodder2 as mod2

View file

@ -31,9 +31,8 @@ import random
import unittest
import warnings
import weakref
import gc
import abc
from itertools import chain, cycle, count
from itertools import cycle, count
from collections import deque
from test import test_support as support

View file

@ -42,7 +42,6 @@ from test.test_support import captured_stdout, run_with_locale, run_unittest,\
find_unused_port
import textwrap
import threading
import time
import unittest
import warnings
import weakref

View file

@ -583,8 +583,6 @@ class LongTest(unittest.TestCase):
# ----------------------------------- tests of auto int->long conversion
def test_auto_overflow(self):
import math, sys
special = [0, 1, 2, 3, sys.maxint-1, sys.maxint, sys.maxint+1]
sqrt = int(math.sqrt(sys.maxint))
special.extend([sqrt-1, sqrt, sqrt+1])
@ -704,8 +702,6 @@ class LongTest(unittest.TestCase):
self.assertEqual(long(float(x)), y)
def test_float_overflow(self):
import math
for x in -2.0, -1.0, 0.0, 1.0, 2.0:
self.assertEqual(float(long(x)), x)
@ -735,8 +731,6 @@ class LongTest(unittest.TestCase):
"float(shuge) should not equal int(shuge)")
def test_logs(self):
import math
LOG10E = math.log10(math.e)
for exp in range(10) + [100, 1000, 10000]:
@ -756,7 +750,6 @@ class LongTest(unittest.TestCase):
def test_mixed_compares(self):
eq = self.assertEqual
import math
# We're mostly concerned with that mixing floats and longs does the
# right stuff, even when longs are too large to fit in a float.

View file

@ -4,8 +4,6 @@ import os
import subprocess
MacOS = test_support.import_module('MacOS')
#The following should exist if MacOS exists.
import Carbon.File
TESTFN2 = test_support.TESTFN + '2'

View file

@ -11,7 +11,6 @@ from test import test_support as support
import io
import _pyio as pyio
import sys
import pickle
class MemorySeekTestMixin:

View file

@ -5,7 +5,6 @@
#
from test import test_support
from test import test_multibytecodec_support
from test.test_support import TESTFN
import unittest, StringIO, codecs, sys, os
import _multibytecodec

View file

@ -1,6 +1,6 @@
import ntpath
import os
from test.test_support import verbose, TestFailed
from test.test_support import TestFailed
import test.test_support as test_support
import unittest

View file

@ -19,9 +19,9 @@ from StringIO import StringIO
from test import test_support
from optparse import make_option, Option, IndentedHelpFormatter, \
TitledHelpFormatter, OptionParser, OptionContainer, OptionGroup, \
SUPPRESS_HELP, SUPPRESS_USAGE, OptionError, OptionConflictError, \
from optparse import make_option, Option, \
TitledHelpFormatter, OptionParser, OptionGroup, \
SUPPRESS_USAGE, OptionError, OptionConflictError, \
BadOptionError, OptionValueError, Values
from optparse import _match_abbrev
from optparse import _parse_num
@ -1236,7 +1236,6 @@ class TestCallbackVarArgs(BaseTest):
def variable_args(self, option, opt, value, parser):
self.assertTrue(value is None)
done = 0
value = []
rargs = parser.rargs
while rargs:

View file

@ -134,7 +134,6 @@ class TemporaryFileTests(unittest.TestCase):
self.assertTrue(s == "foobar")
def test_tmpnam(self):
import sys
if not hasattr(os, "tmpnam"):
return
warnings.filterwarnings("ignore", "tmpnam", RuntimeWarning,
@ -185,8 +184,6 @@ class StatAttributeTests(unittest.TestCase):
self.assertEquals(result[stat.ST_SIZE], 3)
self.assertEquals(result.st_size, 3)
import sys
# Make sure all the attributes are there
members = dir(result)
for name in dir(stat):

View file

@ -1,5 +1,4 @@
import parser
import os
import unittest
import sys
from test import test_support

View file

@ -2,10 +2,7 @@
# specified test modules (RFE #5142).
import imp
import os
import sys
import doctest
import tempfile
from test import test_support
# This little helper class is essential for testing pdb under doctest.

View file

@ -8,7 +8,6 @@ from __future__ import print_function
import unittest
from test import test_support
import sys
from StringIO import StringIO
NotDefined = object()

View file

@ -1,6 +1,5 @@
"""Test suite for the profile module."""
import os
import sys
import pstats
import unittest

View file

@ -4,7 +4,6 @@
import StringIO, sys
import unittest
import pyexpat
from xml.parsers import expat
from test.test_support import sortdict, run_unittest

View file

@ -1,7 +1,6 @@
# Some simple queue module tests, plus some failure conditions
# to ensure the Queue locks remain stable.
import Queue
import sys
import threading
import time
import unittest

View file

@ -5,7 +5,7 @@ import random
import time
import pickle
import warnings
from math import log, exp, sqrt, pi, fsum, sin
from math import log, exp, pi, fsum, sin
from functools import reduce
from test import test_support

View file

@ -1,7 +1,7 @@
from test.test_support import verbose, run_unittest
import re
from re import Scanner
import sys, os, traceback
import sys, traceback
from weakref import proxy
# Misc tests from Tim Peters' re.doc
@ -715,7 +715,7 @@ class ReTests(unittest.TestCase):
self.assertRaises(OverflowError, _sre.compile, "abc", 0, [long_overflow])
def run_re_tests():
from test.re_tests import benchmarks, tests, SUCCEED, FAIL, SYNTAX_ERROR
from test.re_tests import tests, SUCCEED, FAIL, SYNTAX_ERROR
if verbose:
print 'Running re_tests test suite'
else:

View file

@ -5,7 +5,6 @@ import weakref
import operator
import copy
import pickle
import os
from random import randrange, shuffle
import sys
import collections
@ -1694,7 +1693,6 @@ class TestGraphs(unittest.TestCase):
#==============================================================================
def test_main(verbose=None):
from test import test_sets
test_classes = (
TestSet,
TestSetSubclass,

View file

@ -3,7 +3,6 @@ Test suite for SocketServer.py.
"""
import contextlib
import errno
import imp
import os
import select
@ -11,13 +10,11 @@ import signal
import socket
import tempfile
import threading
import time
import unittest
import SocketServer
import test.test_support
from test.test_support import reap_children, reap_threads, verbose
from test.test_support import TESTFN as TEST_FILE
test.test_support.requires("network")

View file

@ -1,4 +1,3 @@
import unittest
from test.test_support import run_unittest, import_module
# Skip test if _sqlite3 module was not built.

View file

@ -6,13 +6,10 @@ from test import test_support
import asyncore
import socket
import select
import errno
import subprocess
import time
import os
import pprint
import urllib, urlparse
import shutil
import traceback
from BaseHTTPServer import HTTPServer

View file

@ -4,7 +4,6 @@ Unittest for time.strftime
import calendar
import sys
import os
import re
from test import test_support
import time

View file

@ -6,7 +6,7 @@ warnings.filterwarnings("ignore", "struct integer overflow masking is deprecated
DeprecationWarning)
from functools import wraps
from test.test_support import TestFailed, verbose, run_unittest
from test.test_support import run_unittest
import sys
ISBIGENDIAN = sys.byteorder == "big"

View file

@ -5,7 +5,7 @@ from _testcapi import test_structmembersType, \
LONG_MAX, LONG_MIN, ULONG_MAX, \
LLONG_MAX, LLONG_MIN, ULLONG_MAX
import warnings, exceptions, unittest, sys
import unittest
from test import test_support
ts=test_structmembersType(False, 1, 2, 3, 4, 5, 6, 7, 8,

View file

@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
import unittest, test.test_support
import sys, cStringIO, os
import sys, os, cStringIO
import struct
import operator
@ -415,7 +415,7 @@ class SysModuleTest(unittest.TestCase):
sys._clear_type_cache()
def test_ioencoding(self):
import subprocess,os
import subprocess
env = dict(os.environ)
# Test character: cent sign, encoded as 0x4A (ASCII J) in CP424,

View file

@ -6,7 +6,6 @@ executing have not been removed.
"""
import unittest
import sys
import test
import os
import shutil
from copy import copy, deepcopy
@ -80,7 +79,7 @@ class TestSysConfig(unittest.TestCase):
return self._uname
def _cleanup_testfn(self):
path = test.test_support.TESTFN
path = TESTFN
if os.path.isfile(path):
os.remove(path)
elif os.path.isdir(path):

View file

@ -3,7 +3,6 @@
import sys
import os
import shutil
import tempfile
import StringIO
from hashlib import md5
import errno

View file

@ -3,7 +3,6 @@ import tempfile
import os
import sys
import re
import errno
import warnings
import unittest

View file

@ -1,5 +1,4 @@
import os
import sys
import unittest
from test import test_support

View file

@ -529,7 +529,7 @@ Evil tabs
from test import test_support
from tokenize import (tokenize, untokenize, generate_tokens, NUMBER, NAME, OP,
from tokenize import (untokenize, generate_tokens, NUMBER, NAME, OP,
STRING, ENDMARKER, tok_name)
from StringIO import StringIO
import os

View file

@ -67,7 +67,7 @@ class TracebackCases(unittest.TestCase):
self.assertTrue(err[1].find("2") == err[2].find("^"))
def test_bug737473(self):
import sys, os, tempfile, time
import os, tempfile, time
savedpath = sys.path[:]
testdir = tempfile.mkdtemp()

View file

@ -1,5 +1,4 @@
import os
import sys
import unittest
from test import test_support

View file

@ -1,5 +1,4 @@
import os
import sys
from test import test_support
# Skip this test if _tkinter does not exist.

View file

@ -20,7 +20,6 @@ class TypesTests(unittest.TestCase):
if not {'x': 1}: self.fail('{\'x\': 1} is false instead of true')
def f(): pass
class C: pass
import sys
x = C()
if not f: self.fail('f is false instead of true')
if not C: self.fail('C is false instead of true')

View file

@ -1,6 +1,5 @@
from test.test_support import run_unittest, have_unicode
from test.test_support import run_unittest
import unittest
import sys
class TestImplementationComparisons(unittest.TestCase):

View file

@ -6,9 +6,7 @@ from test.test_urllib2 import sanepathname2url
import socket
import urllib2
import sys
import os
import mimetools
def _retry_thrice(func, exc, *args, **kwargs):
@ -73,7 +71,7 @@ class AuthTests(unittest.TestCase):
class CloseSocketTest(unittest.TestCase):
def test_close(self):
import socket, httplib, gc
import httplib
# calling .close() on urllib2's response objects should close the
# underlying socket
@ -154,7 +152,6 @@ class OtherNetworkTests(unittest.TestCase):
## self._test_urls(urls, self._extra_handlers()+[bauth, dauth])
def _test_urls(self, urls, handlers, retry=True):
import socket
import time
import logging
debug = logging.getLogger("test_urllib2").debug

View file

@ -2,7 +2,6 @@
# all included components work as they should. For a more extensive
# test suite, see the selftest script in the ElementTree distribution.
import doctest
import sys
from test import test_support

View file

@ -1,6 +1,5 @@
# xml.etree test for cElementTree
import doctest
import sys
from test import test_support

View file

@ -2,7 +2,6 @@
# for working with modules located inside zipfiles
# The tests are centralised in this fashion to make it easy to drop them
# if a platform doesn't support zipimport
import unittest
import test.test_support
import os
import os.path
@ -15,8 +14,7 @@ import inspect
import linecache
import pdb
from test.script_helper import (spawn_python, kill_python, run_python,
temp_dir, make_script, compile_script,
make_pkg, make_zip_script, make_zip_pkg)
temp_dir, make_script, make_zip_script)
verbose = test.test_support.verbose