Patch #2167 from calvin: Remove unused imports

Lib/SimpleHTTPServer.py

@@ -14,7 +14,6 @@ import os
 import posixpath
 import BaseHTTPServer
 import urllib
-import urlparse
 import cgi
 import shutil
 import mimetypes

Lib/bsddb/test/test_basics.py

@@ -4,7 +4,6 @@ various DB flags, etc.
 """
 
 import os
-import sys
 import errno
 import shutil
 import string

Lib/bsddb/test/test_compat.py

@@ -3,7 +3,7 @@ Test cases adapted from the test_bsddb.py module in Python's
 regression test suite.
 """
 
-import sys, os, string
+import os, string
 import unittest
 import tempfile
 

Lib/bsddb/test/test_cursor_pget_bug.py

@@ -1,6 +1,6 @@
 import unittest
 import tempfile
-import sys, os, glob
+import os, glob
 
 try:
     # For Pythons w/distutils pybsddb

Lib/bsddb/test/test_dbobj.py

@@ -1,5 +1,5 @@
 
-import sys, os, string
+import os, string
 import unittest
 import glob
 import tempfile

Lib/bsddb/test/test_dbshelve.py

@@ -2,9 +2,8 @@
 TestCases for checking dbShelve objects.
 """
 
-import sys, os, string
+import os, string
 import tempfile, random
-from pprint import pprint
 from types import *
 import unittest
 

Lib/bsddb/test/test_dbtables.py

@@ -20,7 +20,7 @@
 #
 # $Id$
 
-import sys, os, re
+import os, re
 import tempfile
 import shutil
 try:

Lib/bsddb/test/test_env_close.py

@@ -3,7 +3,6 @@ is closed before its DB objects.
 """
 
 import os
-import sys
 import tempfile
 import glob
 import unittest

Lib/bsddb/test/test_get_none.py

@@ -2,9 +2,8 @@
 TestCases for checking set_get_returns_none.
 """
 
-import sys, os, string
+import os, string
 import tempfile
-from pprint import pprint
 import unittest
 
 try:

Lib/bsddb/test/test_join.py

@@ -1,10 +1,8 @@
 """TestCases for using the DB.join and DBCursor.join_item methods.
 """
 
-import sys, os, string
+import os
 import tempfile
-import time
-from pprint import pprint
 
 try:
     from threading import Thread, currentThread

Lib/bsddb/test/test_lock.py

@@ -2,10 +2,7 @@
 TestCases for testing the locking sub-system.
 """
 
-import os
-from pprint import pprint
 import shutil
-import sys
 import tempfile
 import time
 

Lib/bsddb/test/test_misc.py

@@ -2,7 +2,6 @@
 """
 
 import os
-import sys
 import unittest
 import tempfile
 

Lib/bsddb/test/test_pickle.py

@@ -1,5 +1,5 @@
 
-import sys, os, string
+import os
 import pickle
 try:
     import cPickle

Lib/bsddb/test/test_queue.py

@@ -2,7 +2,7 @@
 TestCases for exercising a Queue DB.
 """
 
-import sys, os, string
+import os, string
 import tempfile
 from pprint import pprint
 import unittest

Lib/bsddb/test/test_recno.py

@@ -2,7 +2,6 @@
 """
 
 import os
-import sys
 import errno
 import tempfile
 from pprint import pprint

Lib/bsddb/test/test_sequence.py

@@ -1,6 +1,5 @@
 import unittest
 import os
-import sys
 import tempfile
 import glob
 
@@ -10,8 +9,6 @@ try:
 except ImportError:
     from bsddb import db
 
-from test_all import verbose
-
 
 class DBSequenceTest(unittest.TestCase):
     def setUp(self):

Lib/bsddb/test/test_thread.py

@@ -7,7 +7,6 @@ import time
 import errno
 import shutil
 import tempfile
-from pprint import pprint
 from random import random
 
 try:

Lib/compiler/transformer.py

@@ -29,7 +29,6 @@ from compiler.ast import *
 import parser
 import symbol
 import token
-import sys
 
 class WalkerError(StandardError):
     pass

Lib/ctypes/test/__init__.py

@@ -1,4 +1,4 @@
-import glob, os, sys, unittest, getopt, time
+import os, sys, unittest, getopt, time
 
 use_resources = []
 

Lib/ctypes/test/test_checkretval.py

@@ -1,5 +1,4 @@
 import unittest
-import sys
 
 from ctypes import *
 

Lib/ctypes/test/test_find.py

@@ -1,5 +1,5 @@
 import unittest
-import os, sys
+import sys
 from ctypes import *
 from ctypes.util import find_library
 from ctypes.test import is_resource_enabled

Lib/ctypes/test/test_libc.py

@@ -1,4 +1,3 @@
-import sys, os
 import unittest
 
 from ctypes import *

Lib/ctypes/test/test_loading.py

@@ -1,6 +1,6 @@
 from ctypes import *
 import sys, unittest
-import os, StringIO
+import os
 from ctypes.util import find_library
 from ctypes.test import is_resource_enabled
 

Lib/ctypes/test/test_numbers.py

@@ -1,6 +1,6 @@
 from ctypes import *
 import unittest
-import sys, struct
+import struct
 
 def valid_ranges(*types):
     # given a sequence of numeric types, collect their _type_

Lib/curses/wrapper.py

@@ -7,7 +7,7 @@ to a sane state so you can read the resulting traceback.
 
 """
 
-import sys, curses
+import curses
 
 def wrapper(func, *args, **kwds):
     """Wrapper function that initializes curses and calls another function,

Lib/distutils/bcppcompiler.py

@@ -16,7 +16,7 @@ for the Borland C++ compiler.
 __revision__ = "$Id$"
 
 
-import sys, os
+import os
 from distutils.errors import \
      DistutilsExecError, DistutilsPlatformError, \
      CompileError, LibError, LinkError, UnknownFileError

Lib/distutils/command/bdist.py

@@ -7,7 +7,7 @@ distribution)."""
 
 __revision__ = "$Id$"
 
-import os, string
+import os
 from types import *
 from distutils.core import Command
 from distutils.errors import *

Lib/distutils/command/bdist_dumb.py

@@ -11,7 +11,7 @@ __revision__ = "$Id$"
 import os
 from distutils.core import Command
 from distutils.util import get_platform
-from distutils.dir_util import create_tree, remove_tree, ensure_relative
+from distutils.dir_util import remove_tree, ensure_relative
 from distutils.errors import *
 from distutils.sysconfig import get_python_version
 from distutils import log

Lib/distutils/command/bdist_msi.py

@@ -7,7 +7,7 @@
 Implements the bdist_msi command.
 """
 
-import sys, os, string
+import sys, os
 from distutils.core import Command
 from distutils.util import get_platform
 from distutils.dir_util import remove_tree

Lib/distutils/command/bdist_rpm.py

@@ -8,7 +8,6 @@ distributions)."""
 __revision__ = "$Id$"
 
 import sys, os, string
-import glob
 from types import *
 from distutils.core import Command
 from distutils.debug import DEBUG

Lib/distutils/command/build_py.py

@@ -6,7 +6,7 @@ Implements the Distutils 'build_py' command."""
 
 __revision__ = "$Id$"
 
-import sys, string, os
+import string, os
 from types import *
 from glob import glob
 

Lib/distutils/command/build_scripts.py

@@ -6,7 +6,7 @@ Implements the Distutils 'build_scripts' command."""
 
 __revision__ = "$Id$"
 
-import sys, os, re
+import os, re
 from stat import ST_MODE
 from distutils import sysconfig
 from distutils.core import Command

Lib/distutils/command/install.py

@@ -17,7 +17,6 @@ from distutils.errors import DistutilsPlatformError
 from distutils.file_util import write_file
 from distutils.util import convert_path, subst_vars, change_root
 from distutils.errors import DistutilsOptionError
-from glob import glob
 
 if sys.version < "2.2":
     WINDOWS_SCHEME = {

Lib/distutils/command/install_headers.py

@@ -7,7 +7,6 @@ files to the Python include directory."""
 
 __revision__ = "$Id$"
 
-import os
 from distutils.core import Command
 
 

Lib/distutils/command/install_lib.py

@@ -2,7 +2,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string
+import os
 from types import IntType
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError

Lib/distutils/command/register.py

@@ -7,7 +7,7 @@ Implements the Distutils 'register' command (register with the repository).
 
 __revision__ = "$Id$"
 
-import sys, os, string, urllib2, getpass, urlparse
+import os, string, urllib2, getpass, urlparse
 import StringIO, ConfigParser
 
 from distutils.core import Command

Lib/distutils/command/sdist.py

@@ -6,7 +6,7 @@ Implements the Distutils 'sdist' command (create a source distribution)."""
 
 __revision__ = "$Id$"
 
-import sys, os, string
+import os, string
 from types import *
 from glob import glob
 from distutils.core import Command

Lib/distutils/filelist.py

@@ -11,7 +11,6 @@ __revision__ = "$Id$"
 import os, string, re
 import fnmatch
 from types import *
-from glob import glob
 from distutils.util import convert_path
 from distutils.errors import DistutilsTemplateError, DistutilsInternalError
 from distutils import log

Lib/distutils/tests/test_dist.py

@@ -3,10 +3,8 @@
 import distutils.cmd
 import distutils.dist
 import os
-import shutil
 import StringIO
 import sys
-import tempfile
 import unittest
 
 from test.test_support import TESTFN

Lib/distutils/tests/test_sysconfig.py

@@ -2,7 +2,6 @@
 
 from distutils import sysconfig
 import os
-import sys
 import unittest
 
 from test.test_support import TESTFN

Lib/distutils/unixccompiler.py

@@ -17,7 +17,6 @@ __revision__ = "$Id$"
 
 import os, sys
 from types import StringType, NoneType
-from copy import copy
 
 from distutils import sysconfig
 from distutils.dep_util import newer

Lib/email/base64mime.py

@@ -35,7 +35,6 @@ __all__ = [
     'header_encode',
     ]
 
-import re
 
 from binascii import b2a_base64, a2b_base64
 from email.utils import fix_eols

Lib/email/utils.py

@@ -27,7 +27,6 @@ import random
 import socket
 import urllib
 import warnings
-from cStringIO import StringIO
 
 from email._parseaddr import quote
 from email._parseaddr import AddressList as _AddressList

Lib/hotshot/log.py

@@ -2,7 +2,6 @@ import _hotshot
 import os.path
 import parser
 import symbol
-import sys
 
 from _hotshot import \
      WHAT_ENTER, \

Lib/hotshot/stones.py

@@ -1,7 +1,6 @@
 import errno
 import hotshot
 import hotshot.stats
-import os
 import sys
 import test.pystone
 

Lib/httplib.py

@@ -66,7 +66,6 @@ Req-started-unread-response    _CS_REQ_STARTED    <response_class>
 Req-sent-unread-response       _CS_REQ_SENT       <response_class>
 """
 
-import errno
 import mimetools
 import socket
 from urlparse import urlsplit

Lib/idlelib/MultiCall.py

@@ -30,7 +30,6 @@ Each function will be called at most once for each event.
 """
 
 import sys
-import os
 import string
 import re
 import Tkinter

Lib/idlelib/RemoteDebugger.py

@@ -20,7 +20,6 @@ barrier, in particular frame and traceback objects.
 
 """
 
-import sys
 import types
 import rpc
 import Debugger

Lib/idlelib/TreeWidget.py

@@ -15,7 +15,6 @@
 # - optimize tree redraw after expand of subnode
 
 import os
-import sys
 from Tkinter import *
 import imp
 

Lib/idlelib/UndoDelegator.py

@@ -1,4 +1,3 @@
-import sys
 import string
 from Tkinter import *
 from Delegator import Delegator

Lib/idlelib/configDialog.py

@@ -11,7 +11,7 @@ Refer to comments in EditorWindow autoindent code for details.
 """
 from Tkinter import *
 import tkMessageBox, tkColorChooser, tkFont
-import string, copy
+import string
 
 from configHandler import idleConf
 from dynOptionMenuWidget import DynOptionMenu

Lib/idlelib/keybindingDialog.py

@@ -3,7 +3,7 @@ Dialog for building Tkinter accelerator key bindings
 """
 from Tkinter import *
 import tkMessageBox
-import string, os
+import string
 
 class GetKeysDialog(Toplevel):
     def __init__(self,parent,title,action,currentKeySequences):

Lib/idlelib/run.py

@@ -1,5 +1,4 @@
 import sys
-import os
 import linecache
 import time
 import socket

Lib/lib-tk/tkSimpleDialog.py

@@ -26,7 +26,6 @@ askstring -- get a string from the user
 '''
 
 from Tkinter import *
-import os
 
 class Dialog(Toplevel):
 

Lib/logging/handlers.py

@@ -27,7 +27,7 @@ Copyright (C) 2001-2007 Vinay Sajip. All Rights Reserved.
 To use, simply 'import logging' and log away!
 """
 
-import sys, logging, socket, types, os, string, cPickle, struct, time, glob
+import logging, socket, types, os, string, cPickle, struct, time, glob
 from stat import ST_DEV, ST_INO
 
 try:

Lib/ntpath.py

@@ -6,8 +6,8 @@ module as os.path.
 """
 
 import os
-import stat
 import sys
+import stat
 import genericpath
 from genericpath import *
 

Lib/plat-mac/MiniAEFrame.py

@@ -6,7 +6,6 @@ There are two classes:
         only suitable for the simplest of AppleEvent servers.
 """
 
-import sys
 import traceback
 import MacOS
 from Carbon import AE

Lib/plat-mac/aepack.py

@@ -13,18 +13,14 @@ coerce(x, wanted_sample) coerces a python object to another python object
 #
 
 import struct
-import string
 import types
-from string import strip
 from types import *
 from Carbon import AE
 from Carbon.AppleEvents import *
 import MacOS
 import Carbon.File
-import StringIO
 import aetypes
 from aetypes import mkenum, ObjectSpecifier
-import os
 
 # These ones seem to be missing from AppleEvents
 # (they're in AERegistry.h)

Lib/plat-mac/bgenlocations.py

@@ -5,7 +5,7 @@
 # but mac-style for MacPython, whether running on OS9 or OSX.
 #
 
-import sys, os
+import os
 
 Error = "bgenlocations.Error"
 #

Lib/plat-mac/macostools.py

@@ -7,9 +7,7 @@ copy(src, dst) - Full copy of 'src' to 'dst'
 from Carbon import Res
 from Carbon import File, Files
 import os
-import sys
 import MacOS
-import time
 try:
     openrf = MacOS.openrf
 except AttributeError:

Lib/plat-riscos/rourl2path.py

@@ -4,7 +4,6 @@ Do not import directly, use urllib instead."""
 
 import string
 import urllib
-import os
 
 __all__ = ["url2pathname","pathname2url"]
 

Lib/sqlite3/test/hooks.py

@@ -21,7 +21,7 @@
 #    misrepresented as being the original software.
 # 3. This notice may not be removed or altered from any source distribution.
 
-import os, unittest
+import unittest
 import sqlite3 as sqlite
 
 class CollationTests(unittest.TestCase):

Lib/ssl.py

@@ -55,7 +55,7 @@ PROTOCOL_SSLv23
 PROTOCOL_TLSv1
 """
 
-import os, sys, textwrap
+import textwrap
 
 import _ssl             # if we can't import it, let the error propagate
 

Lib/test/fork_wait.py

@@ -13,7 +13,6 @@ the same application, the present example should work just fine.  DC
 """
 
 import os, sys, time, thread, unittest
-from test.test_support import TestSkipped
 
 LONGSLEEP = 2
 SHORTSLEEP = 0.5

Lib/test/list_tests.py

@@ -5,7 +5,6 @@ Tests common to list and UserList.UserList
 import sys
 import os
 
-import unittest
 from test import test_support, seq_tests
 
 class CommonTest(seq_tests.CommonTest):

Lib/test/seq_tests.py

@@ -3,7 +3,6 @@ Tests common to tuple, list and UserList.UserList
 """
 
 import unittest
-from test import test_support
 import sys
 
 # Various iterables

Lib/test/test_MimeWriter.py

@@ -7,7 +7,7 @@ This should generate Barry's example, modulo some quotes and newlines.
 
 """
 
-import unittest, sys, StringIO
+import unittest, StringIO
 from test.test_support import run_unittest
 
 import warnings

Lib/test/test___all__.py

@@ -1,5 +1,5 @@
 import unittest
-from test.test_support import verbose, run_unittest
+from test.test_support import run_unittest
 import sys
 import warnings
 

Lib/test/test_abc.py

@@ -3,7 +3,6 @@
 
 """Unit tests for abc.py."""
 
-import sys
 import unittest
 from test import test_support
 

Lib/test/test_applesingle.py

@@ -5,7 +5,6 @@ import macostools
 import Carbon.File
 import MacOS
 import os
-import sys
 from test import test_support
 import struct
 import applesingle

Lib/test/test_array.py

@@ -6,7 +6,7 @@
 import unittest
 from test import test_support
 from weakref import proxy
-import array, cStringIO, math
+import array, cStringIO
 from cPickle import loads, dumps
 
 class ArraySubclass(array.array):

Lib/test/test_bsddb185.py

@@ -4,7 +4,7 @@ The file 185test.db found in Lib/test/ is for testing purposes with this
 testing suite.
 
 """
-from test.test_support import verbose, run_unittest, findfile
+from test.test_support import run_unittest, findfile
 import unittest
 import bsddb185
 import anydbm

Lib/test/test_class.py

@@ -1,7 +1,6 @@
 "Test the functionality of Python classes implementing operators."
 
 import unittest
-import sys
 
 from test import test_support
 

Lib/test/test_cmd.py

@@ -5,7 +5,6 @@ Original by Michael Schneider
 """
 
 
-from test import test_support
 import cmd
 import sys
 
@@ -170,7 +169,7 @@ def test_main(verbose=None):
     from test import test_support, test_cmd
     test_support.run_doctest(test_cmd, verbose)
 
-import trace, sys,re,StringIO
+import trace, sys
 def test_coverage(coverdir):
     tracer=trace.Trace(ignoredirs=[sys.prefix, sys.exec_prefix,],
                         trace=0, count=1)

Lib/test/test_coercion.py

@@ -1,5 +1,4 @@
 import copy
-import sys
 import warnings
 import unittest
 from test.test_support import run_unittest, TestFailed

Lib/test/test_compare.py

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

Lib/test/test_compiler.py

@@ -52,7 +52,8 @@ class CompilerTest(unittest.TestCase):
                         compiler.compile(buf, basename, "exec")
                     except Exception, e:
                         args = list(e.args)
-                        args[0] += "[in file %s]" % basename
+                        args.append("in file %s]" % basename)
+                        #args[0] += "[in file %s]" % basename
                         e.args = tuple(args)
                         raise
 

Lib/test/test_copy.py

@@ -1,6 +1,5 @@
 """Unit tests for the copy module."""
 
-import sys
 import copy
 import copy_reg
 

Lib/test/test_cpickle.py

@@ -1,5 +1,4 @@
 import cPickle
-import unittest
 from cStringIO import StringIO
 from test.pickletester import AbstractPickleTests, AbstractPickleModuleTests
 from test import test_support

Lib/test/test_datetime.py

@@ -4,7 +4,6 @@ See http://www.zope.org/Members/fdrake/DateTimeWiki/TestCases
 """
 
 import os
-import sys
 import pickle
 import cPickle
 import unittest

Lib/test/test_dbm.py

@@ -3,7 +3,6 @@
    Roger E. Masse
 """
 import os
-import random
 import dbm
 from dbm import error
 from test.test_support import verbose, verify, TestSkipped, TESTFN

Lib/test/test_deque.py

@@ -4,7 +4,6 @@ from test import test_support, seq_tests
 from weakref import proxy
 import copy
 import cPickle as pickle
-from cStringIO import StringIO
 import random
 import os
 

Lib/test/test_dict.py

@@ -1,7 +1,7 @@
 import unittest
 from test import test_support
 
-import sys, UserDict, cStringIO, random, string
+import UserDict, random, string
 
 
 class DictTest(unittest.TestCase):

Lib/test/test_dis.py

@@ -1,6 +1,6 @@
 # Minimal tests for dis module
 
-from test.test_support import verbose, run_unittest
+from test.test_support import run_unittest
 import unittest
 import sys
 import dis

Lib/test/test_doctest.py

@@ -2418,7 +2418,7 @@ def test_main():
     from test import test_doctest
     test_support.run_doctest(test_doctest, verbosity=True)
 
-import trace, sys, re, StringIO
+import trace, sys
 def test_coverage(coverdir):
     tracer = trace.Trace(ignoredirs=[sys.prefix, sys.exec_prefix,],
                          trace=0, count=1)

Lib/test/test_dummy_threading.py

@@ -3,7 +3,6 @@
 # Create a bunch of threads, let each do some work, wait until all are done
 
 from test.test_support import verbose
-import random
 import dummy_threading as _threading
 import time
 

Lib/test/test_email.py

@@ -1,7 +1,6 @@
 # Copyright (C) 2001,2002 Python Software Foundation
 # email package unit tests
 
-import unittest
 # The specific tests now live in Lib/email/test
 from email.test.test_email import suite
 from test import test_support

Lib/test/test_email_renamed.py

@@ -1,7 +1,6 @@
 # Copyright (C) 2001-2006 Python Software Foundation
 # email package unit tests
 
-import unittest
 # The specific tests now live in Lib/email/test
 from email.test.test_email_renamed import suite
 from test import test_support

Lib/test/test_eof.py

@@ -1,7 +1,6 @@
 #! /usr/bin/env python
 """test script for a few new invalid token catches"""
 
-import os
 import unittest
 from test import test_support
 

Lib/test/test_extcall.py

@@ -1,4 +1,4 @@
-from test.test_support import verify, verbose, TestFailed, sortdict
+from test.test_support import verify, TestFailed, sortdict
 from UserList import UserList
 from UserDict import UserDict
 

Lib/test/test_fileinput.py

@@ -6,7 +6,7 @@ Nick Mathewson
 import unittest
 from test.test_support import verbose, TESTFN, run_unittest
 from test.test_support import unlink as safe_unlink
-import sys, os, re
+import sys, re
 from StringIO import StringIO
 from fileinput import FileInput, hook_encoded
 

Lib/test/test_fractions.py

@@ -1,7 +1,7 @@
 """Tests for Lib/fractions.py."""
 
 from decimal import Decimal
-from test.test_support import run_unittest, verbose
+from test.test_support import run_unittest
 import math
 import operator
 import fractions

Lib/test/test_getargs2.py

@@ -1,8 +1,7 @@
 import unittest
 from test import test_support
-import sys
 
-import warnings, re
+import warnings
 warnings.filterwarnings("ignore",
                         category=DeprecationWarning,
                         message=".*integer argument expected, got float",

Lib/test/test_gzip.py

@@ -4,7 +4,7 @@
 
 import unittest
 from test import test_support
-import sys, os
+import os
 import gzip
 
 

Lib/test/test_htmlparser.py

@@ -2,7 +2,6 @@
 
 import HTMLParser
 import pprint
-import sys
 import unittest
 from test import test_support
 

Lib/test/test_httplib.py

@@ -1,6 +1,5 @@
 import httplib
 import StringIO
-import sys
 import socket
 
 from unittest import TestCase

Lib/test/test_imgfile.py

@@ -6,7 +6,7 @@
 
 from test.test_support import verbose, unlink, findfile
 
-import imgfile, uu, os
+import imgfile, uu
 
 
 def main():

Lib/test/test_imp.py

@@ -1,5 +1,4 @@
 import imp
-import thread
 import unittest
 from test import test_support
 

Lib/test/test_index.py

@@ -1,7 +1,6 @@
 import unittest
 from test import test_support
 import operator
-import sys
 from sys import maxint
 maxsize = test_support.MAX_Py_ssize_t
 minsize = -maxsize-1

Lib/test/test_linuxaudiodev.py

@@ -4,13 +4,9 @@ test_support.requires('audio')
 from test.test_support import findfile, TestSkipped, run_unittest
 
 import errno
-import fcntl
 import linuxaudiodev
-import os
 import sys
-import select
 import sunaudio
-import time
 import audioop
 import unittest