Sat Feb 23 18:40:16 CET 2008

Author: christian.heimes
Date: Sat Feb 23 18:40:11 2008
New Revision: 61000

Modified:
   python/trunk/Lib/SimpleHTTPServer.py
   python/trunk/Lib/bsddb/test/test_basics.py
   python/trunk/Lib/bsddb/test/test_compat.py
   python/trunk/Lib/bsddb/test/test_cursor_pget_bug.py
   python/trunk/Lib/bsddb/test/test_dbobj.py
   python/trunk/Lib/bsddb/test/test_dbshelve.py
   python/trunk/Lib/bsddb/test/test_dbtables.py
   python/trunk/Lib/bsddb/test/test_env_close.py
   python/trunk/Lib/bsddb/test/test_get_none.py
   python/trunk/Lib/bsddb/test/test_join.py
   python/trunk/Lib/bsddb/test/test_lock.py
   python/trunk/Lib/bsddb/test/test_misc.py
   python/trunk/Lib/bsddb/test/test_pickle.py
   python/trunk/Lib/bsddb/test/test_queue.py
   python/trunk/Lib/bsddb/test/test_recno.py
   python/trunk/Lib/bsddb/test/test_sequence.py
   python/trunk/Lib/bsddb/test/test_thread.py
   python/trunk/Lib/compiler/transformer.py
   python/trunk/Lib/ctypes/test/__init__.py
   python/trunk/Lib/ctypes/test/test_checkretval.py
   python/trunk/Lib/ctypes/test/test_find.py
   python/trunk/Lib/ctypes/test/test_libc.py
   python/trunk/Lib/ctypes/test/test_loading.py
   python/trunk/Lib/ctypes/test/test_numbers.py
   python/trunk/Lib/curses/wrapper.py
   python/trunk/Lib/distutils/bcppcompiler.py
   python/trunk/Lib/distutils/command/bdist.py
   python/trunk/Lib/distutils/command/bdist_dumb.py
   python/trunk/Lib/distutils/command/bdist_msi.py
   python/trunk/Lib/distutils/command/bdist_rpm.py
   python/trunk/Lib/distutils/command/build_py.py
   python/trunk/Lib/distutils/command/build_scripts.py
   python/trunk/Lib/distutils/command/install.py
   python/trunk/Lib/distutils/command/install_headers.py
   python/trunk/Lib/distutils/command/install_lib.py
   python/trunk/Lib/distutils/command/register.py
   python/trunk/Lib/distutils/command/sdist.py
   python/trunk/Lib/distutils/filelist.py
   python/trunk/Lib/distutils/tests/test_dist.py
   python/trunk/Lib/distutils/tests/test_sysconfig.py
   python/trunk/Lib/distutils/unixccompiler.py
   python/trunk/Lib/email/base64mime.py
   python/trunk/Lib/email/utils.py
   python/trunk/Lib/hotshot/log.py
   python/trunk/Lib/hotshot/stones.py
   python/trunk/Lib/httplib.py
   python/trunk/Lib/idlelib/MultiCall.py
   python/trunk/Lib/idlelib/RemoteDebugger.py
   python/trunk/Lib/idlelib/TreeWidget.py
   python/trunk/Lib/idlelib/UndoDelegator.py
   python/trunk/Lib/idlelib/configDialog.py
   python/trunk/Lib/idlelib/keybindingDialog.py
   python/trunk/Lib/idlelib/run.py
   python/trunk/Lib/lib-tk/tkSimpleDialog.py
   python/trunk/Lib/logging/handlers.py
   python/trunk/Lib/ntpath.py
   python/trunk/Lib/plat-mac/MiniAEFrame.py
   python/trunk/Lib/plat-mac/aepack.py
   python/trunk/Lib/plat-mac/bgenlocations.py
   python/trunk/Lib/plat-mac/macostools.py
   python/trunk/Lib/plat-riscos/rourl2path.py
   python/trunk/Lib/sqlite3/test/hooks.py
   python/trunk/Lib/ssl.py
   python/trunk/Lib/test/fork_wait.py
   python/trunk/Lib/test/list_tests.py
   python/trunk/Lib/test/seq_tests.py
   python/trunk/Lib/test/test_MimeWriter.py
   python/trunk/Lib/test/test___all__.py
   python/trunk/Lib/test/test_abc.py
   python/trunk/Lib/test/test_applesingle.py
   python/trunk/Lib/test/test_array.py
   python/trunk/Lib/test/test_bsddb185.py
   python/trunk/Lib/test/test_class.py
   python/trunk/Lib/test/test_cmd.py
   python/trunk/Lib/test/test_coercion.py
   python/trunk/Lib/test/test_compare.py
   python/trunk/Lib/test/test_compiler.py
   python/trunk/Lib/test/test_copy.py
   python/trunk/Lib/test/test_cpickle.py
   python/trunk/Lib/test/test_datetime.py
   python/trunk/Lib/test/test_dbm.py
   python/trunk/Lib/test/test_deque.py
   python/trunk/Lib/test/test_dict.py
   python/trunk/Lib/test/test_dis.py
   python/trunk/Lib/test/test_doctest.py
   python/trunk/Lib/test/test_dummy_threading.py
   python/trunk/Lib/test/test_email.py
   python/trunk/Lib/test/test_email_renamed.py
   python/trunk/Lib/test/test_eof.py
   python/trunk/Lib/test/test_extcall.py
   python/trunk/Lib/test/test_fileinput.py
   python/trunk/Lib/test/test_fractions.py
   python/trunk/Lib/test/test_getargs2.py
   python/trunk/Lib/test/test_gzip.py
   python/trunk/Lib/test/test_htmlparser.py
   python/trunk/Lib/test/test_httplib.py
   python/trunk/Lib/test/test_imgfile.py
   python/trunk/Lib/test/test_imp.py
   python/trunk/Lib/test/test_index.py
   python/trunk/Lib/test/test_linuxaudiodev.py
   python/trunk/Lib/test/test_list.py
   python/trunk/Lib/test/test_logging.py
   python/trunk/Lib/test/test_minidom.py
   python/trunk/Lib/test/test_module.py
   python/trunk/Lib/test/test_modulefinder.py
   python/trunk/Lib/test/test_multibytecodec_support.py
   python/trunk/Lib/test/test_optparse.py
   python/trunk/Lib/test/test_ossaudiodev.py
   python/trunk/Lib/test/test_pickle.py
   python/trunk/Lib/test/test_pkg.py
   python/trunk/Lib/test/test_plistlib.py
   python/trunk/Lib/test/test_poll.py
   python/trunk/Lib/test/test_posix.py
   python/trunk/Lib/test/test_pyclbr.py
   python/trunk/Lib/test/test_quopri.py
   python/trunk/Lib/test/test_resource.py
   python/trunk/Lib/test/test_rfc822.py
   python/trunk/Lib/test/test_scriptpackages.py
   python/trunk/Lib/test/test_sgmllib.py
   python/trunk/Lib/test/test_shlex.py
   python/trunk/Lib/test/test_site.py
   python/trunk/Lib/test/test_socketserver.py
   python/trunk/Lib/test/test_sqlite.py
   python/trunk/Lib/test/test_str.py
   python/trunk/Lib/test/test_strftime.py
   python/trunk/Lib/test/test_sunaudiodev.py
   python/trunk/Lib/test/test_support.py
   python/trunk/Lib/test/test_tuple.py
   python/trunk/Lib/test/test_unicode.py
   python/trunk/Lib/test/test_unpack.py
   python/trunk/Lib/test/test_urllib.py
   python/trunk/Lib/test/test_urllib2.py
   python/trunk/Lib/test/test_urllib2_localnet.py
   python/trunk/Lib/test/test_userdict.py
   python/trunk/Lib/test/test_userlist.py
   python/trunk/Lib/test/test_userstring.py
   python/trunk/Lib/test/test_uu.py
   python/trunk/Lib/test/test_whichdb.py
   python/trunk/Lib/test/test_xml_etree.py
   python/trunk/Lib/test/test_xml_etree_c.py
   python/trunk/Lib/test/test_xpickle.py
   python/trunk/Lib/test/test_zipfile64.py
   python/trunk/Mac/Demo/PICTbrowse/ICONbrowse.py
   python/trunk/Mac/Demo/PICTbrowse/PICTbrowse.py
   python/trunk/Mac/Demo/PICTbrowse/PICTbrowse2.py
   python/trunk/Mac/Demo/PICTbrowse/cicnbrowse.py
   python/trunk/Mac/Demo/PICTbrowse/oldPICTbrowse.py
   python/trunk/Mac/Demo/example1/dnslookup-1.py
   python/trunk/Mac/Demo/example2/dnslookup-2.py
   python/trunk/Mac/Demo/imgbrowse/imgbrowse.py
   python/trunk/Mac/Demo/imgbrowse/mac_image.py
   python/trunk/Mac/Demo/sound/morse.py
   python/trunk/Mac/Modules/ae/aescan.py
   python/trunk/Mac/Modules/ah/ahscan.py
   python/trunk/Mac/Modules/app/appscan.py
   python/trunk/Mac/Modules/carbonevt/CarbonEvtscan.py
   python/trunk/Mac/Modules/cf/cfscan.py
   python/trunk/Mac/Modules/cg/cgscan.py
   python/trunk/Mac/Modules/cm/cmscan.py
   python/trunk/Mac/Modules/ctl/ctlscan.py
   python/trunk/Mac/Modules/dlg/dlgscan.py
   python/trunk/Mac/Modules/drag/dragscan.py
   python/trunk/Mac/Modules/evt/evtscan.py
   python/trunk/Mac/Modules/file/filescan.py
   python/trunk/Mac/Modules/fm/fmscan.py
   python/trunk/Mac/Modules/folder/folderscan.py
   python/trunk/Mac/Modules/help/helpscan.py
   python/trunk/Mac/Modules/ibcarbon/IBCarbonscan.py
   python/trunk/Mac/Modules/icn/icnscan.py
   python/trunk/Mac/Modules/launch/launchscan.py
   python/trunk/Mac/Modules/list/listscan.py
   python/trunk/Mac/Modules/menu/menuscan.py
   python/trunk/Mac/Modules/mlte/mltescan.py
   python/trunk/Mac/Modules/osa/osascan.py
   python/trunk/Mac/Modules/qd/qdscan.py
   python/trunk/Mac/Modules/qdoffs/qdoffsscan.py
   python/trunk/Mac/Modules/qt/qtscan.py
   python/trunk/Mac/Modules/res/resscan.py
   python/trunk/Mac/Modules/scrap/scrapscan.py
   python/trunk/Mac/Modules/snd/sndscan.py
   python/trunk/Mac/Modules/te/tescan.py
   python/trunk/Mac/Modules/win/winscan.py
   python/trunk/Misc/BeOS-setup.py
   python/trunk/PC/VS8.0/build_tkinter.py
   python/trunk/PCbuild/build_tkinter.py
   python/trunk/Parser/asdl_c.py
   python/trunk/Parser/spark.py
   python/trunk/Tools/compiler/astgen.py
   python/trunk/Tools/compiler/dumppyc.py
   python/trunk/Tools/faqwiz/faqw.py
   python/trunk/Tools/modulator/Tkextra.py
   python/trunk/Tools/pybench/systimes.py
   python/trunk/Tools/pynche/ChipViewer.py
   python/trunk/Tools/pynche/TypeinViewer.py
   python/trunk/Tools/scripts/logmerge.py
   python/trunk/Tools/scripts/nm2def.py
   python/trunk/Tools/scripts/pindent.py
   python/trunk/Tools/scripts/pysource.py
   python/trunk/Tools/scripts/xxci.py
   python/trunk/Tools/ssl/get-remote-certificate.py
   python/trunk/Tools/unicode/gencodec.py
   python/trunk/Tools/webchecker/wcgui.py
   python/trunk/Tools/webchecker/wsgui.py
Log:
Patch #2167 from calvin: Remove unused imports

Modified: python/trunk/Lib/SimpleHTTPServer.py
==============================================================================

--- python/trunk/Lib/SimpleHTTPServer.py	(original)
+++ python/trunk/Lib/SimpleHTTPServer.py	Sat Feb 23 18:40:11 2008
@@ -14,7 +14,6 @@
 import posixpath
 import BaseHTTPServer
 import urllib
-import urlparse
 import cgi
 import shutil
 import mimetypes

Modified: python/trunk/Lib/bsddb/test/test_basics.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_basics.py	(original)
+++ python/trunk/Lib/bsddb/test/test_basics.py	Sat Feb 23 18:40:11 2008
@@ -4,7 +4,6 @@
 """
 
 import os
-import sys
 import errno
 import shutil
 import string

Modified: python/trunk/Lib/bsddb/test/test_compat.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_compat.py	(original)
+++ python/trunk/Lib/bsddb/test/test_compat.py	Sat Feb 23 18:40:11 2008
@@ -3,7 +3,7 @@
 regression test suite.
 """
 
-import sys, os, string
+import os, string
 import unittest
 import tempfile
 

Modified: python/trunk/Lib/bsddb/test/test_cursor_pget_bug.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_cursor_pget_bug.py	(original)
+++ python/trunk/Lib/bsddb/test/test_cursor_pget_bug.py	Sat Feb 23 18:40:11 2008
@@ -1,6 +1,6 @@
 import unittest
 import tempfile
-import sys, os, glob
+import os, glob
 
 try:
     # For Pythons w/distutils pybsddb

Modified: python/trunk/Lib/bsddb/test/test_dbobj.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_dbobj.py	(original)
+++ python/trunk/Lib/bsddb/test/test_dbobj.py	Sat Feb 23 18:40:11 2008
@@ -1,5 +1,5 @@
 
-import sys, os, string
+import os, string
 import unittest
 import glob
 import tempfile

Modified: python/trunk/Lib/bsddb/test/test_dbshelve.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_dbshelve.py	(original)
+++ python/trunk/Lib/bsddb/test/test_dbshelve.py	Sat Feb 23 18:40:11 2008
@@ -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
 

Modified: python/trunk/Lib/bsddb/test/test_dbtables.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_dbtables.py	(original)
+++ python/trunk/Lib/bsddb/test/test_dbtables.py	Sat Feb 23 18:40:11 2008
@@ -20,7 +20,7 @@
 #
 # $Id$
 
-import sys, os, re
+import os, re
 import tempfile
 import shutil
 try:

Modified: python/trunk/Lib/bsddb/test/test_env_close.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_env_close.py	(original)
+++ python/trunk/Lib/bsddb/test/test_env_close.py	Sat Feb 23 18:40:11 2008
@@ -3,7 +3,6 @@
 """
 
 import os
-import sys
 import tempfile
 import glob
 import unittest

Modified: python/trunk/Lib/bsddb/test/test_get_none.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_get_none.py	(original)
+++ python/trunk/Lib/bsddb/test/test_get_none.py	Sat Feb 23 18:40:11 2008
@@ -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:

Modified: python/trunk/Lib/bsddb/test/test_join.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_join.py	(original)
+++ python/trunk/Lib/bsddb/test/test_join.py	Sat Feb 23 18:40:11 2008
@@ -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

Modified: python/trunk/Lib/bsddb/test/test_lock.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_lock.py	(original)
+++ python/trunk/Lib/bsddb/test/test_lock.py	Sat Feb 23 18:40:11 2008
@@ -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
 

Modified: python/trunk/Lib/bsddb/test/test_misc.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_misc.py	(original)
+++ python/trunk/Lib/bsddb/test/test_misc.py	Sat Feb 23 18:40:11 2008
@@ -2,7 +2,6 @@
 """
 
 import os
-import sys
 import unittest
 import tempfile
 

Modified: python/trunk/Lib/bsddb/test/test_pickle.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_pickle.py	(original)
+++ python/trunk/Lib/bsddb/test/test_pickle.py	Sat Feb 23 18:40:11 2008
@@ -1,5 +1,5 @@
 
-import sys, os, string
+import os
 import pickle
 try:
     import cPickle

Modified: python/trunk/Lib/bsddb/test/test_queue.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_queue.py	(original)
+++ python/trunk/Lib/bsddb/test/test_queue.py	Sat Feb 23 18:40:11 2008
@@ -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

Modified: python/trunk/Lib/bsddb/test/test_recno.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_recno.py	(original)
+++ python/trunk/Lib/bsddb/test/test_recno.py	Sat Feb 23 18:40:11 2008
@@ -2,7 +2,6 @@
 """
 
 import os
-import sys
 import errno
 import tempfile
 from pprint import pprint

Modified: python/trunk/Lib/bsddb/test/test_sequence.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_sequence.py	(original)
+++ python/trunk/Lib/bsddb/test/test_sequence.py	Sat Feb 23 18:40:11 2008
@@ -1,6 +1,5 @@
 import unittest
 import os
-import sys
 import tempfile
 import glob
 
@@ -10,8 +9,6 @@
 except ImportError:
     from bsddb import db
 
-from test_all import verbose
-
 
 class DBSequenceTest(unittest.TestCase):
     def setUp(self):

Modified: python/trunk/Lib/bsddb/test/test_thread.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_thread.py	(original)
+++ python/trunk/Lib/bsddb/test/test_thread.py	Sat Feb 23 18:40:11 2008
@@ -7,7 +7,6 @@
 import errno
 import shutil
 import tempfile
-from pprint import pprint
 from random import random
 
 try:

Modified: python/trunk/Lib/compiler/transformer.py
==============================================================================
--- python/trunk/Lib/compiler/transformer.py	(original)
+++ python/trunk/Lib/compiler/transformer.py	Sat Feb 23 18:40:11 2008
@@ -29,7 +29,6 @@
 import parser
 import symbol
 import token
-import sys
 
 class WalkerError(StandardError):
     pass

Modified: python/trunk/Lib/ctypes/test/__init__.py
==============================================================================
--- python/trunk/Lib/ctypes/test/__init__.py	(original)
+++ python/trunk/Lib/ctypes/test/__init__.py	Sat Feb 23 18:40:11 2008
@@ -1,4 +1,4 @@
-import glob, os, sys, unittest, getopt, time
+import os, sys, unittest, getopt, time
 
 use_resources = []
 

Modified: python/trunk/Lib/ctypes/test/test_checkretval.py
==============================================================================
--- python/trunk/Lib/ctypes/test/test_checkretval.py	(original)
+++ python/trunk/Lib/ctypes/test/test_checkretval.py	Sat Feb 23 18:40:11 2008
@@ -1,5 +1,4 @@
 import unittest
-import sys
 
 from ctypes import *
 

Modified: python/trunk/Lib/ctypes/test/test_find.py
==============================================================================
--- python/trunk/Lib/ctypes/test/test_find.py	(original)
+++ python/trunk/Lib/ctypes/test/test_find.py	Sat Feb 23 18:40:11 2008
@@ -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

Modified: python/trunk/Lib/ctypes/test/test_libc.py
==============================================================================
--- python/trunk/Lib/ctypes/test/test_libc.py	(original)
+++ python/trunk/Lib/ctypes/test/test_libc.py	Sat Feb 23 18:40:11 2008
@@ -1,4 +1,3 @@
-import sys, os
 import unittest
 
 from ctypes import *

Modified: python/trunk/Lib/ctypes/test/test_loading.py
==============================================================================
--- python/trunk/Lib/ctypes/test/test_loading.py	(original)
+++ python/trunk/Lib/ctypes/test/test_loading.py	Sat Feb 23 18:40:11 2008
@@ -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
 

Modified: python/trunk/Lib/ctypes/test/test_numbers.py
==============================================================================
--- python/trunk/Lib/ctypes/test/test_numbers.py	(original)
+++ python/trunk/Lib/ctypes/test/test_numbers.py	Sat Feb 23 18:40:11 2008
@@ -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_

Modified: python/trunk/Lib/curses/wrapper.py
==============================================================================
--- python/trunk/Lib/curses/wrapper.py	(original)
+++ python/trunk/Lib/curses/wrapper.py	Sat Feb 23 18:40:11 2008
@@ -7,7 +7,7 @@
 
 """
 
-import sys, curses
+import curses
 
 def wrapper(func, *args, **kwds):
     """Wrapper function that initializes curses and calls another function,

Modified: python/trunk/Lib/distutils/bcppcompiler.py
==============================================================================
--- python/trunk/Lib/distutils/bcppcompiler.py	(original)
+++ python/trunk/Lib/distutils/bcppcompiler.py	Sat Feb 23 18:40:11 2008
@@ -16,7 +16,7 @@
 __revision__ = "$Id$"
 
 
-import sys, os
+import os
 from distutils.errors import \
      DistutilsExecError, DistutilsPlatformError, \
      CompileError, LibError, LinkError, UnknownFileError

Modified: python/trunk/Lib/distutils/command/bdist.py
==============================================================================
--- python/trunk/Lib/distutils/command/bdist.py	(original)
+++ python/trunk/Lib/distutils/command/bdist.py	Sat Feb 23 18:40:11 2008
@@ -7,7 +7,7 @@
 
 __revision__ = "$Id$"
 
-import os, string
+import os
 from types import *
 from distutils.core import Command
 from distutils.errors import *

Modified: python/trunk/Lib/distutils/command/bdist_dumb.py
==============================================================================
--- python/trunk/Lib/distutils/command/bdist_dumb.py	(original)
+++ python/trunk/Lib/distutils/command/bdist_dumb.py	Sat Feb 23 18:40:11 2008
@@ -11,7 +11,7 @@
 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

Modified: python/trunk/Lib/distutils/command/bdist_msi.py
==============================================================================
--- python/trunk/Lib/distutils/command/bdist_msi.py	(original)
+++ python/trunk/Lib/distutils/command/bdist_msi.py	Sat Feb 23 18:40:11 2008
@@ -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

Modified: python/trunk/Lib/distutils/command/bdist_rpm.py
==============================================================================
--- python/trunk/Lib/distutils/command/bdist_rpm.py	(original)
+++ python/trunk/Lib/distutils/command/bdist_rpm.py	Sat Feb 23 18:40:11 2008
@@ -8,7 +8,6 @@
 __revision__ = "$Id$"
 
 import sys, os, string
-import glob
 from types import *
 from distutils.core import Command
 from distutils.debug import DEBUG

Modified: python/trunk/Lib/distutils/command/build_py.py
==============================================================================
--- python/trunk/Lib/distutils/command/build_py.py	(original)
+++ python/trunk/Lib/distutils/command/build_py.py	Sat Feb 23 18:40:11 2008
@@ -6,7 +6,7 @@
 
 __revision__ = "$Id$"
 
-import sys, string, os
+import string, os
 from types import *
 from glob import glob
 

Modified: python/trunk/Lib/distutils/command/build_scripts.py
==============================================================================
--- python/trunk/Lib/distutils/command/build_scripts.py	(original)
+++ python/trunk/Lib/distutils/command/build_scripts.py	Sat Feb 23 18:40:11 2008
@@ -6,7 +6,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, re
+import os, re
 from stat import ST_MODE
 from distutils import sysconfig
 from distutils.core import Command

Modified: python/trunk/Lib/distutils/command/install.py
==============================================================================
--- python/trunk/Lib/distutils/command/install.py	(original)
+++ python/trunk/Lib/distutils/command/install.py	Sat Feb 23 18:40:11 2008
@@ -17,7 +17,6 @@
 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 = {

Modified: python/trunk/Lib/distutils/command/install_headers.py
==============================================================================
--- python/trunk/Lib/distutils/command/install_headers.py	(original)
+++ python/trunk/Lib/distutils/command/install_headers.py	Sat Feb 23 18:40:11 2008
@@ -7,7 +7,6 @@
 
 __revision__ = "$Id$"
 
-import os
 from distutils.core import Command
 
 

Modified: python/trunk/Lib/distutils/command/install_lib.py
==============================================================================
--- python/trunk/Lib/distutils/command/install_lib.py	(original)
+++ python/trunk/Lib/distutils/command/install_lib.py	Sat Feb 23 18:40:11 2008
@@ -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

Modified: python/trunk/Lib/distutils/command/register.py
==============================================================================
--- python/trunk/Lib/distutils/command/register.py	(original)
+++ python/trunk/Lib/distutils/command/register.py	Sat Feb 23 18:40:11 2008
@@ -7,7 +7,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, urllib2, getpass, urlparse
+import os, string, urllib2, getpass, urlparse
 import StringIO, ConfigParser
 
 from distutils.core import Command

Modified: python/trunk/Lib/distutils/command/sdist.py
==============================================================================
--- python/trunk/Lib/distutils/command/sdist.py	(original)
+++ python/trunk/Lib/distutils/command/sdist.py	Sat Feb 23 18:40:11 2008
@@ -6,7 +6,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string
+import os, string
 from types import *
 from glob import glob
 from distutils.core import Command

Modified: python/trunk/Lib/distutils/filelist.py
==============================================================================
--- python/trunk/Lib/distutils/filelist.py	(original)
+++ python/trunk/Lib/distutils/filelist.py	Sat Feb 23 18:40:11 2008
@@ -11,7 +11,6 @@
 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

Modified: python/trunk/Lib/distutils/tests/test_dist.py
==============================================================================
--- python/trunk/Lib/distutils/tests/test_dist.py	(original)
+++ python/trunk/Lib/distutils/tests/test_dist.py	Sat Feb 23 18:40:11 2008
@@ -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

Modified: python/trunk/Lib/distutils/tests/test_sysconfig.py
==============================================================================
--- python/trunk/Lib/distutils/tests/test_sysconfig.py	(original)
+++ python/trunk/Lib/distutils/tests/test_sysconfig.py	Sat Feb 23 18:40:11 2008
@@ -2,7 +2,6 @@
 
 from distutils import sysconfig
 import os
-import sys
 import unittest
 
 from test.test_support import TESTFN

Modified: python/trunk/Lib/distutils/unixccompiler.py
==============================================================================
--- python/trunk/Lib/distutils/unixccompiler.py	(original)
+++ python/trunk/Lib/distutils/unixccompiler.py	Sat Feb 23 18:40:11 2008
@@ -17,7 +17,6 @@
 
 import os, sys
 from types import StringType, NoneType
-from copy import copy
 
 from distutils import sysconfig
 from distutils.dep_util import newer

Modified: python/trunk/Lib/email/base64mime.py
==============================================================================
--- python/trunk/Lib/email/base64mime.py	(original)
+++ python/trunk/Lib/email/base64mime.py	Sat Feb 23 18:40:11 2008
@@ -35,7 +35,6 @@
     'header_encode',
     ]
 
-import re
 
 from binascii import b2a_base64, a2b_base64
 from email.utils import fix_eols

Modified: python/trunk/Lib/email/utils.py
==============================================================================
--- python/trunk/Lib/email/utils.py	(original)
+++ python/trunk/Lib/email/utils.py	Sat Feb 23 18:40:11 2008
@@ -27,7 +27,6 @@
 import socket
 import urllib
 import warnings
-from cStringIO import StringIO
 
 from email._parseaddr import quote
 from email._parseaddr import AddressList as _AddressList

Modified: python/trunk/Lib/hotshot/log.py
==============================================================================
--- python/trunk/Lib/hotshot/log.py	(original)
+++ python/trunk/Lib/hotshot/log.py	Sat Feb 23 18:40:11 2008
@@ -2,7 +2,6 @@
 import os.path
 import parser
 import symbol
-import sys
 
 from _hotshot import \
      WHAT_ENTER, \

Modified: python/trunk/Lib/hotshot/stones.py
==============================================================================
--- python/trunk/Lib/hotshot/stones.py	(original)
+++ python/trunk/Lib/hotshot/stones.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 import errno
 import hotshot
 import hotshot.stats
-import os
 import sys
 import test.pystone
 

Modified: python/trunk/Lib/httplib.py
==============================================================================
--- python/trunk/Lib/httplib.py	(original)
+++ python/trunk/Lib/httplib.py	Sat Feb 23 18:40:11 2008
@@ -66,7 +66,6 @@
 Req-sent-unread-response       _CS_REQ_SENT       <response_class>
 """
 
-import errno
 import mimetools
 import socket
 from urlparse import urlsplit

Modified: python/trunk/Lib/idlelib/MultiCall.py
==============================================================================
--- python/trunk/Lib/idlelib/MultiCall.py	(original)
+++ python/trunk/Lib/idlelib/MultiCall.py	Sat Feb 23 18:40:11 2008
@@ -30,7 +30,6 @@
 """
 
 import sys
-import os
 import string
 import re
 import Tkinter

Modified: python/trunk/Lib/idlelib/RemoteDebugger.py
==============================================================================
--- python/trunk/Lib/idlelib/RemoteDebugger.py	(original)
+++ python/trunk/Lib/idlelib/RemoteDebugger.py	Sat Feb 23 18:40:11 2008
@@ -20,7 +20,6 @@
 
 """
 
-import sys
 import types
 import rpc
 import Debugger

Modified: python/trunk/Lib/idlelib/TreeWidget.py
==============================================================================
--- python/trunk/Lib/idlelib/TreeWidget.py	(original)
+++ python/trunk/Lib/idlelib/TreeWidget.py	Sat Feb 23 18:40:11 2008
@@ -15,7 +15,6 @@
 # - optimize tree redraw after expand of subnode
 
 import os
-import sys
 from Tkinter import *
 import imp
 

Modified: python/trunk/Lib/idlelib/UndoDelegator.py
==============================================================================
--- python/trunk/Lib/idlelib/UndoDelegator.py	(original)
+++ python/trunk/Lib/idlelib/UndoDelegator.py	Sat Feb 23 18:40:11 2008
@@ -1,4 +1,3 @@
-import sys
 import string
 from Tkinter import *
 from Delegator import Delegator

Modified: python/trunk/Lib/idlelib/configDialog.py
==============================================================================
--- python/trunk/Lib/idlelib/configDialog.py	(original)
+++ python/trunk/Lib/idlelib/configDialog.py	Sat Feb 23 18:40:11 2008
@@ -11,7 +11,7 @@
 """
 from Tkinter import *
 import tkMessageBox, tkColorChooser, tkFont
-import string, copy
+import string
 
 from configHandler import idleConf
 from dynOptionMenuWidget import DynOptionMenu

Modified: python/trunk/Lib/idlelib/keybindingDialog.py
==============================================================================
--- python/trunk/Lib/idlelib/keybindingDialog.py	(original)
+++ python/trunk/Lib/idlelib/keybindingDialog.py	Sat Feb 23 18:40:11 2008
@@ -3,7 +3,7 @@
 """
 from Tkinter import *
 import tkMessageBox
-import string, os
+import string
 
 class GetKeysDialog(Toplevel):
     def __init__(self,parent,title,action,currentKeySequences):

Modified: python/trunk/Lib/idlelib/run.py
==============================================================================
--- python/trunk/Lib/idlelib/run.py	(original)
+++ python/trunk/Lib/idlelib/run.py	Sat Feb 23 18:40:11 2008
@@ -1,5 +1,4 @@
 import sys
-import os
 import linecache
 import time
 import socket

Modified: python/trunk/Lib/lib-tk/tkSimpleDialog.py
==============================================================================
--- python/trunk/Lib/lib-tk/tkSimpleDialog.py	(original)
+++ python/trunk/Lib/lib-tk/tkSimpleDialog.py	Sat Feb 23 18:40:11 2008
@@ -26,7 +26,6 @@
 '''
 
 from Tkinter import *
-import os
 
 class Dialog(Toplevel):
 

Modified: python/trunk/Lib/logging/handlers.py
==============================================================================
--- python/trunk/Lib/logging/handlers.py	(original)
+++ python/trunk/Lib/logging/handlers.py	Sat Feb 23 18:40:11 2008
@@ -27,7 +27,7 @@
 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:

Modified: python/trunk/Lib/ntpath.py
==============================================================================
--- python/trunk/Lib/ntpath.py	(original)
+++ python/trunk/Lib/ntpath.py	Sat Feb 23 18:40:11 2008
@@ -6,8 +6,8 @@
 """
 
 import os
-import stat
 import sys
+import stat
 import genericpath
 from genericpath import *
 

Modified: python/trunk/Lib/plat-mac/MiniAEFrame.py
==============================================================================
--- python/trunk/Lib/plat-mac/MiniAEFrame.py	(original)
+++ python/trunk/Lib/plat-mac/MiniAEFrame.py	Sat Feb 23 18:40:11 2008
@@ -6,7 +6,6 @@
         only suitable for the simplest of AppleEvent servers.
 """
 
-import sys
 import traceback
 import MacOS
 from Carbon import AE

Modified: python/trunk/Lib/plat-mac/aepack.py
==============================================================================
--- python/trunk/Lib/plat-mac/aepack.py	(original)
+++ python/trunk/Lib/plat-mac/aepack.py	Sat Feb 23 18:40:11 2008
@@ -13,18 +13,14 @@
 #
 
 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)

Modified: python/trunk/Lib/plat-mac/bgenlocations.py
==============================================================================
--- python/trunk/Lib/plat-mac/bgenlocations.py	(original)
+++ python/trunk/Lib/plat-mac/bgenlocations.py	Sat Feb 23 18:40:11 2008
@@ -5,7 +5,7 @@
 # but mac-style for MacPython, whether running on OS9 or OSX.
 #
 
-import sys, os
+import os
 
 Error = "bgenlocations.Error"
 #

Modified: python/trunk/Lib/plat-mac/macostools.py
==============================================================================
--- python/trunk/Lib/plat-mac/macostools.py	(original)
+++ python/trunk/Lib/plat-mac/macostools.py	Sat Feb 23 18:40:11 2008
@@ -7,9 +7,7 @@
 from Carbon import Res
 from Carbon import File, Files
 import os
-import sys
 import MacOS
-import time
 try:
     openrf = MacOS.openrf
 except AttributeError:

Modified: python/trunk/Lib/plat-riscos/rourl2path.py
==============================================================================
--- python/trunk/Lib/plat-riscos/rourl2path.py	(original)
+++ python/trunk/Lib/plat-riscos/rourl2path.py	Sat Feb 23 18:40:11 2008
@@ -4,7 +4,6 @@
 
 import string
 import urllib
-import os
 
 __all__ = ["url2pathname","pathname2url"]
 

Modified: python/trunk/Lib/sqlite3/test/hooks.py
==============================================================================
--- python/trunk/Lib/sqlite3/test/hooks.py	(original)
+++ python/trunk/Lib/sqlite3/test/hooks.py	Sat Feb 23 18:40:11 2008
@@ -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):

Modified: python/trunk/Lib/ssl.py
==============================================================================
--- python/trunk/Lib/ssl.py	(original)
+++ python/trunk/Lib/ssl.py	Sat Feb 23 18:40:11 2008
@@ -55,7 +55,7 @@
 PROTOCOL_TLSv1
 """
 
-import os, sys, textwrap
+import textwrap
 
 import _ssl             # if we can't import it, let the error propagate
 

Modified: python/trunk/Lib/test/fork_wait.py
==============================================================================
--- python/trunk/Lib/test/fork_wait.py	(original)
+++ python/trunk/Lib/test/fork_wait.py	Sat Feb 23 18:40:11 2008
@@ -13,7 +13,6 @@
 """
 
 import os, sys, time, thread, unittest
-from test.test_support import TestSkipped
 
 LONGSLEEP = 2
 SHORTSLEEP = 0.5

Modified: python/trunk/Lib/test/list_tests.py
==============================================================================
--- python/trunk/Lib/test/list_tests.py	(original)
+++ python/trunk/Lib/test/list_tests.py	Sat Feb 23 18:40:11 2008
@@ -5,7 +5,6 @@
 import sys
 import os
 
-import unittest
 from test import test_support, seq_tests
 
 class CommonTest(seq_tests.CommonTest):

Modified: python/trunk/Lib/test/seq_tests.py
==============================================================================
--- python/trunk/Lib/test/seq_tests.py	(original)
+++ python/trunk/Lib/test/seq_tests.py	Sat Feb 23 18:40:11 2008
@@ -3,7 +3,6 @@
 """
 
 import unittest
-from test import test_support
 import sys
 
 # Various iterables

Modified: python/trunk/Lib/test/test_MimeWriter.py
==============================================================================
--- python/trunk/Lib/test/test_MimeWriter.py	(original)
+++ python/trunk/Lib/test/test_MimeWriter.py	Sat Feb 23 18:40:11 2008
@@ -7,7 +7,7 @@
 
 """
 
-import unittest, sys, StringIO
+import unittest, StringIO
 from test.test_support import run_unittest
 
 import warnings

Modified: python/trunk/Lib/test/test___all__.py
==============================================================================
--- python/trunk/Lib/test/test___all__.py	(original)
+++ python/trunk/Lib/test/test___all__.py	Sat Feb 23 18:40:11 2008
@@ -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
 

Modified: python/trunk/Lib/test/test_abc.py
==============================================================================
--- python/trunk/Lib/test/test_abc.py	(original)
+++ python/trunk/Lib/test/test_abc.py	Sat Feb 23 18:40:11 2008
@@ -3,7 +3,6 @@
 
 """Unit tests for abc.py."""
 
-import sys
 import unittest
 from test import test_support
 

Modified: python/trunk/Lib/test/test_applesingle.py
==============================================================================
--- python/trunk/Lib/test/test_applesingle.py	(original)
+++ python/trunk/Lib/test/test_applesingle.py	Sat Feb 23 18:40:11 2008
@@ -5,7 +5,6 @@
 import Carbon.File
 import MacOS
 import os
-import sys
 from test import test_support
 import struct
 import applesingle

Modified: python/trunk/Lib/test/test_array.py
==============================================================================
--- python/trunk/Lib/test/test_array.py	(original)
+++ python/trunk/Lib/test/test_array.py	Sat Feb 23 18:40:11 2008
@@ -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):

Modified: python/trunk/Lib/test/test_bsddb185.py
==============================================================================
--- python/trunk/Lib/test/test_bsddb185.py	(original)
+++ python/trunk/Lib/test/test_bsddb185.py	Sat Feb 23 18:40:11 2008
@@ -4,7 +4,7 @@
 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

Modified: python/trunk/Lib/test/test_class.py
==============================================================================
--- python/trunk/Lib/test/test_class.py	(original)
+++ python/trunk/Lib/test/test_class.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 "Test the functionality of Python classes implementing operators."
 
 import unittest
-import sys
 
 from test import test_support
 

Modified: python/trunk/Lib/test/test_cmd.py
==============================================================================
--- python/trunk/Lib/test/test_cmd.py	(original)
+++ python/trunk/Lib/test/test_cmd.py	Sat Feb 23 18:40:11 2008
@@ -5,7 +5,6 @@
 """
 
 
-from test import test_support
 import cmd
 import sys
 
@@ -170,7 +169,7 @@
     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)

Modified: python/trunk/Lib/test/test_coercion.py
==============================================================================
--- python/trunk/Lib/test/test_coercion.py	(original)
+++ python/trunk/Lib/test/test_coercion.py	Sat Feb 23 18:40:11 2008
@@ -1,5 +1,4 @@
 import copy
-import sys
 import warnings
 import unittest
 from test.test_support import run_unittest, TestFailed

Modified: python/trunk/Lib/test/test_compare.py
==============================================================================
--- python/trunk/Lib/test/test_compare.py	(original)
+++ python/trunk/Lib/test/test_compare.py	Sat Feb 23 18:40:11 2008
@@ -1,4 +1,3 @@
-import sys
 import unittest
 from test import test_support
 

Modified: python/trunk/Lib/test/test_compiler.py
==============================================================================
--- python/trunk/Lib/test/test_compiler.py	(original)
+++ python/trunk/Lib/test/test_compiler.py	Sat Feb 23 18:40:11 2008
@@ -52,7 +52,8 @@
                         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
 

Modified: python/trunk/Lib/test/test_copy.py
==============================================================================
--- python/trunk/Lib/test/test_copy.py	(original)
+++ python/trunk/Lib/test/test_copy.py	Sat Feb 23 18:40:11 2008
@@ -1,6 +1,5 @@
 """Unit tests for the copy module."""
 
-import sys
 import copy
 import copy_reg
 

Modified: python/trunk/Lib/test/test_cpickle.py
==============================================================================
--- python/trunk/Lib/test/test_cpickle.py	(original)
+++ python/trunk/Lib/test/test_cpickle.py	Sat Feb 23 18:40:11 2008
@@ -1,5 +1,4 @@
 import cPickle
-import unittest
 from cStringIO import StringIO
 from test.pickletester import AbstractPickleTests, AbstractPickleModuleTests
 from test import test_support

Modified: python/trunk/Lib/test/test_datetime.py
==============================================================================
--- python/trunk/Lib/test/test_datetime.py	(original)
+++ python/trunk/Lib/test/test_datetime.py	Sat Feb 23 18:40:11 2008
@@ -4,7 +4,6 @@
 """
 
 import os
-import sys
 import pickle
 import cPickle
 import unittest

Modified: python/trunk/Lib/test/test_dbm.py
==============================================================================
--- python/trunk/Lib/test/test_dbm.py	(original)
+++ python/trunk/Lib/test/test_dbm.py	Sat Feb 23 18:40:11 2008
@@ -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

Modified: python/trunk/Lib/test/test_deque.py
==============================================================================
--- python/trunk/Lib/test/test_deque.py	(original)
+++ python/trunk/Lib/test/test_deque.py	Sat Feb 23 18:40:11 2008
@@ -4,7 +4,6 @@
 from weakref import proxy
 import copy
 import cPickle as pickle
-from cStringIO import StringIO
 import random
 import os
 

Modified: python/trunk/Lib/test/test_dict.py
==============================================================================
--- python/trunk/Lib/test/test_dict.py	(original)
+++ python/trunk/Lib/test/test_dict.py	Sat Feb 23 18:40:11 2008
@@ -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):

Modified: python/trunk/Lib/test/test_dis.py
==============================================================================
--- python/trunk/Lib/test/test_dis.py	(original)
+++ python/trunk/Lib/test/test_dis.py	Sat Feb 23 18:40:11 2008
@@ -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

Modified: python/trunk/Lib/test/test_doctest.py
==============================================================================
--- python/trunk/Lib/test/test_doctest.py	(original)
+++ python/trunk/Lib/test/test_doctest.py	Sat Feb 23 18:40:11 2008
@@ -2418,7 +2418,7 @@
     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)

Modified: python/trunk/Lib/test/test_dummy_threading.py
==============================================================================
--- python/trunk/Lib/test/test_dummy_threading.py	(original)
+++ python/trunk/Lib/test/test_dummy_threading.py	Sat Feb 23 18:40:11 2008
@@ -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
 

Modified: python/trunk/Lib/test/test_email.py
==============================================================================
--- python/trunk/Lib/test/test_email.py	(original)
+++ python/trunk/Lib/test/test_email.py	Sat Feb 23 18:40:11 2008
@@ -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

Modified: python/trunk/Lib/test/test_email_renamed.py
==============================================================================
--- python/trunk/Lib/test/test_email_renamed.py	(original)
+++ python/trunk/Lib/test/test_email_renamed.py	Sat Feb 23 18:40:11 2008
@@ -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

Modified: python/trunk/Lib/test/test_eof.py
==============================================================================
--- python/trunk/Lib/test/test_eof.py	(original)
+++ python/trunk/Lib/test/test_eof.py	Sat Feb 23 18:40:11 2008
@@ -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
 

Modified: python/trunk/Lib/test/test_extcall.py
==============================================================================
--- python/trunk/Lib/test/test_extcall.py	(original)
+++ python/trunk/Lib/test/test_extcall.py	Sat Feb 23 18:40:11 2008
@@ -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
 

Modified: python/trunk/Lib/test/test_fileinput.py
==============================================================================
--- python/trunk/Lib/test/test_fileinput.py	(original)
+++ python/trunk/Lib/test/test_fileinput.py	Sat Feb 23 18:40:11 2008
@@ -6,7 +6,7 @@
 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
 

Modified: python/trunk/Lib/test/test_fractions.py
==============================================================================
--- python/trunk/Lib/test/test_fractions.py	(original)
+++ python/trunk/Lib/test/test_fractions.py	Sat Feb 23 18:40:11 2008
@@ -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

Modified: python/trunk/Lib/test/test_getargs2.py
==============================================================================
--- python/trunk/Lib/test/test_getargs2.py	(original)
+++ python/trunk/Lib/test/test_getargs2.py	Sat Feb 23 18:40:11 2008
@@ -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",

Modified: python/trunk/Lib/test/test_gzip.py
==============================================================================
--- python/trunk/Lib/test/test_gzip.py	(original)
+++ python/trunk/Lib/test/test_gzip.py	Sat Feb 23 18:40:11 2008
@@ -4,7 +4,7 @@
 
 import unittest
 from test import test_support
-import sys, os
+import os
 import gzip
 
 

Modified: python/trunk/Lib/test/test_htmlparser.py
==============================================================================
--- python/trunk/Lib/test/test_htmlparser.py	(original)
+++ python/trunk/Lib/test/test_htmlparser.py	Sat Feb 23 18:40:11 2008
@@ -2,7 +2,6 @@
 
 import HTMLParser
 import pprint
-import sys
 import unittest
 from test import test_support
 

Modified: python/trunk/Lib/test/test_httplib.py
==============================================================================
--- python/trunk/Lib/test/test_httplib.py	(original)
+++ python/trunk/Lib/test/test_httplib.py	Sat Feb 23 18:40:11 2008
@@ -1,6 +1,5 @@
 import httplib
 import StringIO
-import sys
 import socket
 
 from unittest import TestCase

Modified: python/trunk/Lib/test/test_imgfile.py
==============================================================================
--- python/trunk/Lib/test/test_imgfile.py	(original)
+++ python/trunk/Lib/test/test_imgfile.py	Sat Feb 23 18:40:11 2008
@@ -6,7 +6,7 @@
 
 from test.test_support import verbose, unlink, findfile
 
-import imgfile, uu, os
+import imgfile, uu
 
 
 def main():

Modified: python/trunk/Lib/test/test_imp.py
==============================================================================
--- python/trunk/Lib/test/test_imp.py	(original)
+++ python/trunk/Lib/test/test_imp.py	Sat Feb 23 18:40:11 2008
@@ -1,5 +1,4 @@
 import imp
-import thread
 import unittest
 from test import test_support
 

Modified: python/trunk/Lib/test/test_index.py
==============================================================================
--- python/trunk/Lib/test/test_index.py	(original)
+++ python/trunk/Lib/test/test_index.py	Sat Feb 23 18:40:11 2008
@@ -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

Modified: python/trunk/Lib/test/test_linuxaudiodev.py
==============================================================================
--- python/trunk/Lib/test/test_linuxaudiodev.py	(original)
+++ python/trunk/Lib/test/test_linuxaudiodev.py	Sat Feb 23 18:40:11 2008
@@ -4,13 +4,9 @@
 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
 

Modified: python/trunk/Lib/test/test_list.py
==============================================================================
--- python/trunk/Lib/test/test_list.py	(original)
+++ python/trunk/Lib/test/test_list.py	Sat Feb 23 18:40:11 2008
@@ -1,4 +1,3 @@
-import unittest
 import sys
 from test import test_support, list_tests
 

Modified: python/trunk/Lib/test/test_logging.py
==============================================================================
--- python/trunk/Lib/test/test_logging.py	(original)
+++ python/trunk/Lib/test/test_logging.py	Sat Feb 23 18:40:11 2008
@@ -1858,8 +1858,8 @@
 <BLANKLINE>
 """
 import select
-import os, sys, string, struct, types, cPickle, cStringIO
-import socket, tempfile, threading, time
+import os, sys, string, struct, cPickle, cStringIO
+import socket, threading
 import logging, logging.handlers, logging.config, test.test_support
 
 

Modified: python/trunk/Lib/test/test_minidom.py
==============================================================================
--- python/trunk/Lib/test/test_minidom.py	(original)
+++ python/trunk/Lib/test/test_minidom.py	Sat Feb 23 18:40:11 2008
@@ -3,7 +3,6 @@
 import os
 import sys
 import pickle
-import traceback
 from StringIO import StringIO
 from test.test_support import verbose, run_unittest, TestSkipped
 import unittest

Modified: python/trunk/Lib/test/test_module.py
==============================================================================
--- python/trunk/Lib/test/test_module.py	(original)
+++ python/trunk/Lib/test/test_module.py	Sat Feb 23 18:40:11 2008
@@ -1,6 +1,6 @@
 # Test the module type
 import unittest
-from test.test_support import verbose, run_unittest
+from test.test_support import run_unittest
 
 import sys
 ModuleType = type(sys)

Modified: python/trunk/Lib/test/test_modulefinder.py
==============================================================================
--- python/trunk/Lib/test/test_modulefinder.py	(original)
+++ python/trunk/Lib/test/test_modulefinder.py	Sat Feb 23 18:40:11 2008
@@ -1,5 +1,5 @@
 import __future__
-import sys, os
+import os
 import unittest
 import distutils.dir_util
 import tempfile

Modified: python/trunk/Lib/test/test_multibytecodec_support.py
==============================================================================
--- python/trunk/Lib/test/test_multibytecodec_support.py	(original)
+++ python/trunk/Lib/test/test_multibytecodec_support.py	Sat Feb 23 18:40:11 2008
@@ -4,7 +4,7 @@
 #   Common Unittest Routines for CJK codecs
 #
 
-import sys, codecs, os.path
+import sys, codecs
 import unittest, re
 from test import test_support
 from StringIO import StringIO

Modified: python/trunk/Lib/test/test_optparse.py
==============================================================================
--- python/trunk/Lib/test/test_optparse.py	(original)
+++ python/trunk/Lib/test/test_optparse.py	Sat Feb 23 18:40:11 2008
@@ -16,7 +16,6 @@
 import unittest
 
 from StringIO import StringIO
-from pprint import pprint
 from test import test_support
 
 

Modified: python/trunk/Lib/test/test_ossaudiodev.py
==============================================================================
--- python/trunk/Lib/test/test_ossaudiodev.py	(original)
+++ python/trunk/Lib/test/test_ossaudiodev.py	Sat Feb 23 18:40:11 2008
@@ -1,14 +1,11 @@
 from test import test_support
 test_support.requires('audio')
 
-from test.test_support import verbose, findfile, TestSkipped
+from test.test_support import findfile, TestSkipped
 
 import errno
-import fcntl
 import ossaudiodev
-import os
 import sys
-import select
 import sunaudio
 import time
 import audioop

Modified: python/trunk/Lib/test/test_pickle.py
==============================================================================
--- python/trunk/Lib/test/test_pickle.py	(original)
+++ python/trunk/Lib/test/test_pickle.py	Sat Feb 23 18:40:11 2008
@@ -1,5 +1,4 @@
 import pickle
-import unittest
 from cStringIO import StringIO
 
 from test import test_support

Modified: python/trunk/Lib/test/test_pkg.py
==============================================================================
--- python/trunk/Lib/test/test_pkg.py	(original)
+++ python/trunk/Lib/test/test_pkg.py	Sat Feb 23 18:40:11 2008
@@ -4,7 +4,6 @@
 import os
 import tempfile
 import textwrap
-import traceback
 import unittest
 from test import test_support
 

Modified: python/trunk/Lib/test/test_plistlib.py
==============================================================================
--- python/trunk/Lib/test/test_plistlib.py	(original)
+++ python/trunk/Lib/test/test_plistlib.py	Sat Feb 23 18:40:11 2008
@@ -3,7 +3,6 @@
 import unittest
 import plistlib
 import os
-import time
 import datetime
 from test import test_support
 

Modified: python/trunk/Lib/test/test_poll.py
==============================================================================
--- python/trunk/Lib/test/test_poll.py	(original)
+++ python/trunk/Lib/test/test_poll.py	Sat Feb 23 18:40:11 2008
@@ -1,6 +1,6 @@
 # Test case for the os.poll() function
 
-import sys, os, select, random, unittest
+import os, select, random, unittest
 from test.test_support import TestSkipped, TESTFN, run_unittest
 
 try:

Modified: python/trunk/Lib/test/test_posix.py
==============================================================================
--- python/trunk/Lib/test/test_posix.py	(original)
+++ python/trunk/Lib/test/test_posix.py	Sat Feb 23 18:40:11 2008
@@ -9,7 +9,6 @@
 
 import time
 import os
-import sys
 import unittest
 import warnings
 warnings.filterwarnings('ignore', '.* potential security risk .*',

Modified: python/trunk/Lib/test/test_pyclbr.py
==============================================================================
--- python/trunk/Lib/test/test_pyclbr.py	(original)
+++ python/trunk/Lib/test/test_pyclbr.py	Sat Feb 23 18:40:11 2008
@@ -3,7 +3,7 @@
    Nick Mathewson
 '''
 from test.test_support import run_unittest
-import unittest, sys
+import sys
 from types import ClassType, FunctionType, MethodType, BuiltinFunctionType
 import pyclbr
 from unittest import TestCase

Modified: python/trunk/Lib/test/test_quopri.py
==============================================================================
--- python/trunk/Lib/test/test_quopri.py	(original)
+++ python/trunk/Lib/test/test_quopri.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,7 @@
 from test import test_support
 import unittest
 
-import sys, os, cStringIO, subprocess
+import sys, cStringIO, subprocess
 import quopri
 
 

Modified: python/trunk/Lib/test/test_resource.py
==============================================================================
--- python/trunk/Lib/test/test_resource.py	(original)
+++ python/trunk/Lib/test/test_resource.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 import unittest
 from test import test_support
 
-import os
 import resource
 import time
 

Modified: python/trunk/Lib/test/test_rfc822.py
==============================================================================
--- python/trunk/Lib/test/test_rfc822.py	(original)
+++ python/trunk/Lib/test/test_rfc822.py	Sat Feb 23 18:40:11 2008
@@ -1,5 +1,4 @@
 import rfc822
-import sys
 import unittest
 from test import test_support
 

Modified: python/trunk/Lib/test/test_scriptpackages.py
==============================================================================
--- python/trunk/Lib/test/test_scriptpackages.py	(original)
+++ python/trunk/Lib/test/test_scriptpackages.py	Sat Feb 23 18:40:11 2008
@@ -1,9 +1,6 @@
 # Copyright (C) 2003 Python Software Foundation
 
 import unittest
-import os
-import sys
-import tempfile
 from test import test_support
 import aetools
 

Modified: python/trunk/Lib/test/test_sgmllib.py
==============================================================================
--- python/trunk/Lib/test/test_sgmllib.py	(original)
+++ python/trunk/Lib/test/test_sgmllib.py	Sat Feb 23 18:40:11 2008
@@ -1,4 +1,3 @@
-import htmlentitydefs
 import pprint
 import re
 import sgmllib
@@ -116,7 +115,7 @@
         try:
             events = self.get_events(source)
         except:
-            import sys
+            #import sys
             #print >>sys.stderr, pprint.pformat(self.events)
             raise
         if events != expected_events:

Modified: python/trunk/Lib/test/test_shlex.py
==============================================================================
--- python/trunk/Lib/test/test_shlex.py	(original)
+++ python/trunk/Lib/test/test_shlex.py	Sat Feb 23 18:40:11 2008
@@ -1,6 +1,5 @@
 # -*- coding: iso-8859-1 -*-
 import unittest
-import os, sys
 import shlex
 
 from test import test_support

Modified: python/trunk/Lib/test/test_site.py
==============================================================================
--- python/trunk/Lib/test/test_site.py	(original)
+++ python/trunk/Lib/test/test_site.py	Sat Feb 23 18:40:11 2008
@@ -5,12 +5,11 @@
 
 """
 import unittest
-from test.test_support import TestSkipped, TestFailed, run_unittest, TESTFN
+from test.test_support import TestSkipped, run_unittest, TESTFN
 import __builtin__
 import os
 import sys
 import encodings
-import tempfile
 # Need to make sure to not import 'site' if someone specified ``-S`` at the
 # command-line.  Detect this by just making sure 'site' has not been imported
 # already.

Modified: python/trunk/Lib/test/test_socketserver.py
==============================================================================
--- python/trunk/Lib/test/test_socketserver.py	(original)
+++ python/trunk/Lib/test/test_socketserver.py	Sat Feb 23 18:40:11 2008
@@ -9,7 +9,6 @@
 import select
 import time
 import threading
-from functools import wraps
 import unittest
 import SocketServer
 

Modified: python/trunk/Lib/test/test_sqlite.py
==============================================================================
--- python/trunk/Lib/test/test_sqlite.py	(original)
+++ python/trunk/Lib/test/test_sqlite.py	Sat Feb 23 18:40:11 2008
@@ -1,5 +1,4 @@
 from test.test_support import run_unittest, TestSkipped
-import unittest
 
 try:
     import _sqlite3

Modified: python/trunk/Lib/test/test_str.py
==============================================================================
--- python/trunk/Lib/test/test_str.py	(original)
+++ python/trunk/Lib/test/test_str.py	Sat Feb 23 18:40:11 2008
@@ -1,5 +1,4 @@
 
-import unittest
 import struct
 import sys
 from test import test_support, string_tests

Modified: python/trunk/Lib/test/test_strftime.py
==============================================================================
--- python/trunk/Lib/test/test_strftime.py	(original)
+++ python/trunk/Lib/test/test_strftime.py	Sat Feb 23 18:40:11 2008
@@ -2,7 +2,7 @@
 
 # Sanity checker for time.strftime
 
-import time, calendar, sys, os, re
+import time, calendar, sys, re
 from test.test_support import verbose
 
 def main():

Modified: python/trunk/Lib/test/test_sunaudiodev.py
==============================================================================
--- python/trunk/Lib/test/test_sunaudiodev.py	(original)
+++ python/trunk/Lib/test/test_sunaudiodev.py	Sat Feb 23 18:40:11 2008
@@ -1,4 +1,4 @@
-from test.test_support import verbose, findfile, TestFailed, TestSkipped
+from test.test_support import findfile, TestFailed, TestSkipped
 import sunaudiodev
 import os
 

Modified: python/trunk/Lib/test/test_support.py
==============================================================================
--- python/trunk/Lib/test/test_support.py	(original)
+++ python/trunk/Lib/test/test_support.py	Sat Feb 23 18:40:11 2008
@@ -10,7 +10,6 @@
 import os
 import os.path
 import warnings
-import types
 import unittest
 
 class Error(Exception):

Modified: python/trunk/Lib/test/test_tuple.py
==============================================================================
--- python/trunk/Lib/test/test_tuple.py	(original)
+++ python/trunk/Lib/test/test_tuple.py	Sat Feb 23 18:40:11 2008
@@ -1,4 +1,3 @@
-import unittest
 from test import test_support, seq_tests
 
 class TupleTest(seq_tests.CommonTest):

Modified: python/trunk/Lib/test/test_unicode.py
==============================================================================
--- python/trunk/Lib/test/test_unicode.py	(original)
+++ python/trunk/Lib/test/test_unicode.py	Sat Feb 23 18:40:11 2008
@@ -6,7 +6,7 @@
 (c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
 
 """#"
-import unittest, sys, struct, codecs, new
+import sys, struct, codecs
 from test import test_support, string_tests
 
 # Error handling (bad decoder return)

Modified: python/trunk/Lib/test/test_unpack.py
==============================================================================
--- python/trunk/Lib/test/test_unpack.py	(original)
+++ python/trunk/Lib/test/test_unpack.py	Sat Feb 23 18:40:11 2008
@@ -122,7 +122,6 @@
 __test__ = {'doctests' : doctests}
 
 def test_main(verbose=False):
-    import sys
     from test import test_support
     from test import test_unpack
     test_support.run_doctest(test_unpack, verbose)

Modified: python/trunk/Lib/test/test_urllib.py
==============================================================================
--- python/trunk/Lib/test/test_urllib.py	(original)
+++ python/trunk/Lib/test/test_urllib.py	Sat Feb 23 18:40:11 2008
@@ -8,10 +8,6 @@
 import mimetools
 import tempfile
 import StringIO
-import ftplib
-import threading
-import socket
-import time
 
 def hexescape(char):
     """Escape char as RFC 2396 specifies"""

Modified: python/trunk/Lib/test/test_urllib2.py
==============================================================================
--- python/trunk/Lib/test/test_urllib2.py	(original)
+++ python/trunk/Lib/test/test_urllib2.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,7 @@
 import unittest
 from test import test_support
 
-import os, socket
+import os
 import StringIO
 
 import urllib2
@@ -589,7 +589,7 @@
             self.assertEqual(int(headers["Content-length"]), len(data))
 
     def test_file(self):
-        import time, rfc822, socket
+        import rfc822, socket
         h = urllib2.FileHandler()
         o = h.parent = MockOpener()
 
@@ -993,7 +993,7 @@
     def _test_basic_auth(self, opener, auth_handler, auth_header,
                          realm, http_handler, password_manager,
                          request_url, protected_url):
-        import base64, httplib
+        import base64
         user, password = "wile", "coyote"
 
         # .add_password() fed through to password manager

Modified: python/trunk/Lib/test/test_urllib2_localnet.py
==============================================================================
--- python/trunk/Lib/test/test_urllib2_localnet.py	(original)
+++ python/trunk/Lib/test/test_urllib2_localnet.py	Sat Feb 23 18:40:11 2008
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-import sys
 import threading
 import urlparse
 import urllib2

Modified: python/trunk/Lib/test/test_userdict.py
==============================================================================
--- python/trunk/Lib/test/test_userdict.py	(original)
+++ python/trunk/Lib/test/test_userdict.py	Sat Feb 23 18:40:11 2008
@@ -1,6 +1,5 @@
 # Check every path through every method of UserDict
 
-import unittest
 from test import test_support, mapping_tests
 import UserDict
 

Modified: python/trunk/Lib/test/test_userlist.py
==============================================================================
--- python/trunk/Lib/test/test_userlist.py	(original)
+++ python/trunk/Lib/test/test_userlist.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Check every path through every method of UserList
 
 from UserList import UserList
-import unittest
 from test import test_support, list_tests
 
 class UserListTest(list_tests.CommonTest):

Modified: python/trunk/Lib/test/test_userstring.py
==============================================================================
--- python/trunk/Lib/test/test_userstring.py	(original)
+++ python/trunk/Lib/test/test_userstring.py	Sat Feb 23 18:40:11 2008
@@ -2,7 +2,6 @@
 # UserString is a wrapper around the native builtin string type.
 # UserString instances should behave similar to builtin string objects.
 
-import unittest
 import string
 from test import test_support, string_tests
 

Modified: python/trunk/Lib/test/test_uu.py
==============================================================================
--- python/trunk/Lib/test/test_uu.py	(original)
+++ python/trunk/Lib/test/test_uu.py	Sat Feb 23 18:40:11 2008
@@ -8,7 +8,6 @@
 
 import sys, os, uu, cStringIO
 import uu
-from StringIO import StringIO
 
 plaintext = "The smooth-scaled python crept over the sleeping dog\n"
 

Modified: python/trunk/Lib/test/test_whichdb.py
==============================================================================
--- python/trunk/Lib/test/test_whichdb.py	(original)
+++ python/trunk/Lib/test/test_whichdb.py	Sat Feb 23 18:40:11 2008
@@ -8,7 +8,6 @@
 import unittest
 import whichdb
 import anydbm
-import tempfile
 import glob
 
 _fname = test.test_support.TESTFN

Modified: python/trunk/Lib/test/test_xml_etree.py
==============================================================================
--- python/trunk/Lib/test/test_xml_etree.py	(original)
+++ python/trunk/Lib/test/test_xml_etree.py	Sat Feb 23 18:40:11 2008
@@ -2,7 +2,8 @@
 # all included components work as they should.  For a more extensive
 # test suite, see the selftest script in the ElementTree distribution.
 
-import doctest, sys
+import doctest
+import sys
 
 from test import test_support
 

Modified: python/trunk/Lib/test/test_xml_etree_c.py
==============================================================================
--- python/trunk/Lib/test/test_xml_etree_c.py	(original)
+++ python/trunk/Lib/test/test_xml_etree_c.py	Sat Feb 23 18:40:11 2008
@@ -1,6 +1,7 @@
 # xml.etree test for cElementTree
 
-import doctest, sys
+import doctest
+import sys
 
 from test import test_support
 

Modified: python/trunk/Lib/test/test_xpickle.py
==============================================================================
--- python/trunk/Lib/test/test_xpickle.py	(original)
+++ python/trunk/Lib/test/test_xpickle.py	Sat Feb 23 18:40:11 2008
@@ -5,7 +5,6 @@
 
 import pickle
 import cPickle
-import unittest
 
 from test import test_support
 from test.pickletester import AbstractPickleTests

Modified: python/trunk/Lib/test/test_zipfile64.py
==============================================================================
--- python/trunk/Lib/test/test_zipfile64.py	(original)
+++ python/trunk/Lib/test/test_zipfile64.py	Sat Feb 23 18:40:11 2008
@@ -20,7 +20,6 @@
 import time
 import sys
 
-from StringIO import StringIO
 from tempfile import TemporaryFile
 
 from test.test_support import TESTFN, run_unittest

Modified: python/trunk/Mac/Demo/PICTbrowse/ICONbrowse.py
==============================================================================
--- python/trunk/Mac/Demo/PICTbrowse/ICONbrowse.py	(original)
+++ python/trunk/Mac/Demo/PICTbrowse/ICONbrowse.py	Sat Feb 23 18:40:11 2008
@@ -7,8 +7,6 @@
 from Carbon import Win
 from Carbon import Controls
 from Carbon import List
-import sys
-import struct
 from Carbon import Icn
 import macresource
 

Modified: python/trunk/Mac/Demo/PICTbrowse/PICTbrowse.py
==============================================================================
--- python/trunk/Mac/Demo/PICTbrowse/PICTbrowse.py	(original)
+++ python/trunk/Mac/Demo/PICTbrowse/PICTbrowse.py	Sat Feb 23 18:40:11 2008
@@ -7,7 +7,6 @@
 from Carbon import Win
 from Carbon import Controls
 from Carbon import List
-import sys
 import struct
 import macresource
 

Modified: python/trunk/Mac/Demo/PICTbrowse/PICTbrowse2.py
==============================================================================
--- python/trunk/Mac/Demo/PICTbrowse/PICTbrowse2.py	(original)
+++ python/trunk/Mac/Demo/PICTbrowse/PICTbrowse2.py	Sat Feb 23 18:40:11 2008
@@ -7,7 +7,6 @@
 from Carbon import Win
 from Carbon import Controls
 from Carbon import List
-import sys
 import struct
 import macresource
 

Modified: python/trunk/Mac/Demo/PICTbrowse/cicnbrowse.py
==============================================================================
--- python/trunk/Mac/Demo/PICTbrowse/cicnbrowse.py	(original)
+++ python/trunk/Mac/Demo/PICTbrowse/cicnbrowse.py	Sat Feb 23 18:40:11 2008
@@ -7,8 +7,6 @@
 from Carbon import Win
 from Carbon import Controls
 from Carbon import List
-import sys
-import struct
 from Carbon import Icn
 import macresource
 

Modified: python/trunk/Mac/Demo/PICTbrowse/oldPICTbrowse.py
==============================================================================
--- python/trunk/Mac/Demo/PICTbrowse/oldPICTbrowse.py	(original)
+++ python/trunk/Mac/Demo/PICTbrowse/oldPICTbrowse.py	Sat Feb 23 18:40:11 2008
@@ -6,7 +6,6 @@
 from Carbon import Qd
 from Carbon import Win
 from Carbon import List
-import sys
 import struct
 import macresource
 

Modified: python/trunk/Mac/Demo/example1/dnslookup-1.py
==============================================================================
--- python/trunk/Mac/Demo/example1/dnslookup-1.py	(original)
+++ python/trunk/Mac/Demo/example1/dnslookup-1.py	Sat Feb 23 18:40:11 2008
@@ -4,7 +4,6 @@
 import EasyDialogs
 from Carbon import Res
 from Carbon import Dlg
-import sys
 import socket
 import string
 import macresource

Modified: python/trunk/Mac/Demo/example2/dnslookup-2.py
==============================================================================
--- python/trunk/Mac/Demo/example2/dnslookup-2.py	(original)
+++ python/trunk/Mac/Demo/example2/dnslookup-2.py	Sat Feb 23 18:40:11 2008
@@ -2,7 +2,6 @@
 import EasyDialogs
 from Carbon import Res
 from Carbon import Dlg
-import sys
 import socket
 import string
 import macresource

Modified: python/trunk/Mac/Demo/imgbrowse/imgbrowse.py
==============================================================================
--- python/trunk/Mac/Demo/imgbrowse/imgbrowse.py	(original)
+++ python/trunk/Mac/Demo/imgbrowse/imgbrowse.py	Sat Feb 23 18:40:11 2008
@@ -7,11 +7,9 @@
 from Carbon import QuickDraw
 from Carbon import Win
 #ifrom Carbon mport List
-import sys
 import struct
 import img
 import imgformat
-import struct
 import mac_image
 
 

Modified: python/trunk/Mac/Demo/imgbrowse/mac_image.py
==============================================================================
--- python/trunk/Mac/Demo/imgbrowse/mac_image.py	(original)
+++ python/trunk/Mac/Demo/imgbrowse/mac_image.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 """mac_image - Helper routines (hacks) for images"""
 import imgformat
 from Carbon import Qd
-import time
 import struct
 import MacOS
 

Modified: python/trunk/Mac/Demo/sound/morse.py
==============================================================================
--- python/trunk/Mac/Demo/sound/morse.py	(original)
+++ python/trunk/Mac/Demo/sound/morse.py	Sat Feb 23 18:40:11 2008
@@ -1,4 +1,4 @@
-import sys, math, audiodev
+import sys, math
 
 DOT = 30
 DAH = 80

Modified: python/trunk/Mac/Modules/ae/aescan.py
==============================================================================
--- python/trunk/Mac/Modules/ae/aescan.py	(original)
+++ python/trunk/Mac/Modules/ae/aescan.py	Sat Feb 23 18:40:11 2008
@@ -3,8 +3,6 @@
 # (Should learn how to tell the compiler to compile it as well.)
 
 import sys
-import os
-import string
 import MacOS
 
 from bgenlocations import TOOLBOXDIR, BGENDIR

Modified: python/trunk/Mac/Modules/ah/ahscan.py
==============================================================================
--- python/trunk/Mac/Modules/ah/ahscan.py	(original)
+++ python/trunk/Mac/Modules/ah/ahscan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner_OSX

Modified: python/trunk/Mac/Modules/app/appscan.py
==============================================================================
--- python/trunk/Mac/Modules/app/appscan.py	(original)
+++ python/trunk/Mac/Modules/app/appscan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner

Modified: python/trunk/Mac/Modules/carbonevt/CarbonEvtscan.py
==============================================================================
--- python/trunk/Mac/Modules/carbonevt/CarbonEvtscan.py	(original)
+++ python/trunk/Mac/Modules/carbonevt/CarbonEvtscan.py	Sat Feb 23 18:40:11 2008
@@ -1,8 +1,6 @@
 # IBCarbonscan.py
 
 import sys
-import os
-import string
 import MacOS
 import sys
 

Modified: python/trunk/Mac/Modules/cf/cfscan.py
==============================================================================
--- python/trunk/Mac/Modules/cf/cfscan.py	(original)
+++ python/trunk/Mac/Modules/cf/cfscan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner_OSX

Modified: python/trunk/Mac/Modules/cg/cgscan.py
==============================================================================
--- python/trunk/Mac/Modules/cg/cgscan.py	(original)
+++ python/trunk/Mac/Modules/cg/cgscan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner_OSX

Modified: python/trunk/Mac/Modules/cm/cmscan.py
==============================================================================
--- python/trunk/Mac/Modules/cm/cmscan.py	(original)
+++ python/trunk/Mac/Modules/cm/cmscan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner

Modified: python/trunk/Mac/Modules/ctl/ctlscan.py
==============================================================================
--- python/trunk/Mac/Modules/ctl/ctlscan.py	(original)
+++ python/trunk/Mac/Modules/ctl/ctlscan.py	Sat Feb 23 18:40:11 2008
@@ -1,6 +1,5 @@
 # Scan <Controls.h>, generating ctlgen.py.
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 

Modified: python/trunk/Mac/Modules/dlg/dlgscan.py
==============================================================================
--- python/trunk/Mac/Modules/dlg/dlgscan.py	(original)
+++ python/trunk/Mac/Modules/dlg/dlgscan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 

Modified: python/trunk/Mac/Modules/drag/dragscan.py
==============================================================================
--- python/trunk/Mac/Modules/drag/dragscan.py	(original)
+++ python/trunk/Mac/Modules/drag/dragscan.py	Sat Feb 23 18:40:11 2008
@@ -1,6 +1,5 @@
 # Scan <Drag.h>, generating draggen.py.
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR, INCLUDEDIR
 sys.path.append(BGENDIR)
 

Modified: python/trunk/Mac/Modules/evt/evtscan.py
==============================================================================
--- python/trunk/Mac/Modules/evt/evtscan.py	(original)
+++ python/trunk/Mac/Modules/evt/evtscan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner

Modified: python/trunk/Mac/Modules/file/filescan.py
==============================================================================
--- python/trunk/Mac/Modules/file/filescan.py	(original)
+++ python/trunk/Mac/Modules/file/filescan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner_OSX

Modified: python/trunk/Mac/Modules/fm/fmscan.py
==============================================================================
--- python/trunk/Mac/Modules/fm/fmscan.py	(original)
+++ python/trunk/Mac/Modules/fm/fmscan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner

Modified: python/trunk/Mac/Modules/folder/folderscan.py
==============================================================================
--- python/trunk/Mac/Modules/folder/folderscan.py	(original)
+++ python/trunk/Mac/Modules/folder/folderscan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner_OSX

Modified: python/trunk/Mac/Modules/help/helpscan.py
==============================================================================
--- python/trunk/Mac/Modules/help/helpscan.py	(original)
+++ python/trunk/Mac/Modules/help/helpscan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner

Modified: python/trunk/Mac/Modules/ibcarbon/IBCarbonscan.py
==============================================================================
--- python/trunk/Mac/Modules/ibcarbon/IBCarbonscan.py	(original)
+++ python/trunk/Mac/Modules/ibcarbon/IBCarbonscan.py	Sat Feb 23 18:40:11 2008
@@ -1,8 +1,6 @@
 # IBCarbonscan.py
 
 import sys
-import os
-import string
 
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)

Modified: python/trunk/Mac/Modules/icn/icnscan.py
==============================================================================
--- python/trunk/Mac/Modules/icn/icnscan.py	(original)
+++ python/trunk/Mac/Modules/icn/icnscan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner

Modified: python/trunk/Mac/Modules/launch/launchscan.py
==============================================================================
--- python/trunk/Mac/Modules/launch/launchscan.py	(original)
+++ python/trunk/Mac/Modules/launch/launchscan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner

Modified: python/trunk/Mac/Modules/list/listscan.py
==============================================================================
--- python/trunk/Mac/Modules/list/listscan.py	(original)
+++ python/trunk/Mac/Modules/list/listscan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner

Modified: python/trunk/Mac/Modules/menu/menuscan.py
==============================================================================
--- python/trunk/Mac/Modules/menu/menuscan.py	(original)
+++ python/trunk/Mac/Modules/menu/menuscan.py	Sat Feb 23 18:40:11 2008
@@ -1,6 +1,5 @@
 # Scan <Menus.h>, generating menugen.py.
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 

Modified: python/trunk/Mac/Modules/mlte/mltescan.py
==============================================================================
--- python/trunk/Mac/Modules/mlte/mltescan.py	(original)
+++ python/trunk/Mac/Modules/mlte/mltescan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner_OSX

Modified: python/trunk/Mac/Modules/osa/osascan.py
==============================================================================
--- python/trunk/Mac/Modules/osa/osascan.py	(original)
+++ python/trunk/Mac/Modules/osa/osascan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner

Modified: python/trunk/Mac/Modules/qd/qdscan.py
==============================================================================
--- python/trunk/Mac/Modules/qd/qdscan.py	(original)
+++ python/trunk/Mac/Modules/qd/qdscan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 

Modified: python/trunk/Mac/Modules/qdoffs/qdoffsscan.py
==============================================================================
--- python/trunk/Mac/Modules/qdoffs/qdoffsscan.py	(original)
+++ python/trunk/Mac/Modules/qdoffs/qdoffsscan.py	Sat Feb 23 18:40:11 2008
@@ -1,6 +1,5 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 

Modified: python/trunk/Mac/Modules/qt/qtscan.py
==============================================================================
--- python/trunk/Mac/Modules/qt/qtscan.py	(original)
+++ python/trunk/Mac/Modules/qt/qtscan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner

Modified: python/trunk/Mac/Modules/res/resscan.py
==============================================================================
--- python/trunk/Mac/Modules/res/resscan.py	(original)
+++ python/trunk/Mac/Modules/res/resscan.py	Sat Feb 23 18:40:11 2008
@@ -3,8 +3,6 @@
 # (Should learn how to tell the compiler to compile it as well.)
 
 import sys
-import os
-import string
 import MacOS
 
 from bgenlocations import TOOLBOXDIR, BGENDIR

Modified: python/trunk/Mac/Modules/scrap/scrapscan.py
==============================================================================
--- python/trunk/Mac/Modules/scrap/scrapscan.py	(original)
+++ python/trunk/Mac/Modules/scrap/scrapscan.py	Sat Feb 23 18:40:11 2008
@@ -4,7 +4,6 @@
 # generates a boilerplate to be edited by hand.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner

Modified: python/trunk/Mac/Modules/snd/sndscan.py
==============================================================================
--- python/trunk/Mac/Modules/snd/sndscan.py	(original)
+++ python/trunk/Mac/Modules/snd/sndscan.py	Sat Feb 23 18:40:11 2008
@@ -3,7 +3,6 @@
 # (Should learn how to tell the compiler to compile it as well.)
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 

Modified: python/trunk/Mac/Modules/te/tescan.py
==============================================================================
--- python/trunk/Mac/Modules/te/tescan.py	(original)
+++ python/trunk/Mac/Modules/te/tescan.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner

Modified: python/trunk/Mac/Modules/win/winscan.py
==============================================================================
--- python/trunk/Mac/Modules/win/winscan.py	(original)
+++ python/trunk/Mac/Modules/win/winscan.py	Sat Feb 23 18:40:11 2008
@@ -1,6 +1,5 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 import sys
-import os
 from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 

Modified: python/trunk/Misc/BeOS-setup.py
==============================================================================
--- python/trunk/Misc/BeOS-setup.py	(original)
+++ python/trunk/Misc/BeOS-setup.py	Sat Feb 23 18:40:11 2008
@@ -4,7 +4,7 @@
 
 __version__ = "special BeOS after 1.37"
 
-import sys, os, getopt
+import sys, os
 from distutils import sysconfig
 from distutils import text_file
 from distutils.errors import *

Modified: python/trunk/PC/VS8.0/build_tkinter.py
==============================================================================
--- python/trunk/PC/VS8.0/build_tkinter.py	(original)
+++ python/trunk/PC/VS8.0/build_tkinter.py	Sat Feb 23 18:40:11 2008
@@ -7,7 +7,6 @@
 
 import os
 import sys
-import shutil
 
 here = os.path.abspath(os.path.dirname(__file__))
 par = os.path.pardir

Modified: python/trunk/PCbuild/build_tkinter.py
==============================================================================
--- python/trunk/PCbuild/build_tkinter.py	(original)
+++ python/trunk/PCbuild/build_tkinter.py	Sat Feb 23 18:40:11 2008
@@ -7,7 +7,6 @@
 
 import os
 import sys
-import shutil
 
 here = os.path.abspath(os.path.dirname(__file__))
 par = os.path.pardir

Modified: python/trunk/Parser/asdl_c.py
==============================================================================
--- python/trunk/Parser/asdl_c.py	(original)
+++ python/trunk/Parser/asdl_c.py	Sat Feb 23 18:40:11 2008
@@ -4,7 +4,7 @@
 # TO DO
 # handle fields that have a type but no name
 
-import os, sys, traceback
+import os, sys
 
 import asdl
 

Modified: python/trunk/Parser/spark.py
==============================================================================
--- python/trunk/Parser/spark.py	(original)
+++ python/trunk/Parser/spark.py	Sat Feb 23 18:40:11 2008
@@ -22,7 +22,6 @@
 __version__ = 'SPARK-0.7 (pre-alpha-5)'
 
 import re
-import sys
 import string
 
 def _namelist(instance):

Modified: python/trunk/Tools/compiler/astgen.py
==============================================================================
--- python/trunk/Tools/compiler/astgen.py	(original)
+++ python/trunk/Tools/compiler/astgen.py	Sat Feb 23 18:40:11 2008
@@ -8,7 +8,6 @@
 """
 
 import fileinput
-import getopt
 import re
 import sys
 from StringIO import StringIO

Modified: python/trunk/Tools/compiler/dumppyc.py
==============================================================================
--- python/trunk/Tools/compiler/dumppyc.py	(original)
+++ python/trunk/Tools/compiler/dumppyc.py	Sat Feb 23 18:40:11 2008
@@ -1,7 +1,6 @@
 #! /usr/bin/env python
 
 import marshal
-import os
 import dis
 import types
 

Modified: python/trunk/Tools/faqwiz/faqw.py
==============================================================================
--- python/trunk/Tools/faqwiz/faqw.py	(original)
+++ python/trunk/Tools/faqwiz/faqw.py	Sat Feb 23 18:40:11 2008
@@ -20,7 +20,7 @@
 try:
     FAQDIR = "/usr/people/guido/python/FAQ"
     SRCDIR = "/usr/people/guido/python/src/Tools/faqwiz"
-    import os, sys, time, operator
+    import os, sys
     os.chdir(FAQDIR)
     sys.path.insert(0, SRCDIR)
     import faqwiz

Modified: python/trunk/Tools/modulator/Tkextra.py
==============================================================================
--- python/trunk/Tools/modulator/Tkextra.py	(original)
+++ python/trunk/Tools/modulator/Tkextra.py	Sat Feb 23 18:40:11 2008
@@ -218,7 +218,6 @@
                   0, 'Save', 'Save as text')
 
 def _test():
-    import sys
     global mainWidget
     mainWidget = Frame()
     Pack.config(mainWidget)

Modified: python/trunk/Tools/pybench/systimes.py
==============================================================================
--- python/trunk/Tools/pybench/systimes.py	(original)
+++ python/trunk/Tools/pybench/systimes.py	Sat Feb 23 18:40:11 2008
@@ -31,7 +31,7 @@
     the author. All Rights Reserved.
 
 """
-import time, sys, struct
+import time, sys
 
 #
 # Note: Please keep this module compatible to Python 1.5.2.

Modified: python/trunk/Tools/pynche/ChipViewer.py
==============================================================================
--- python/trunk/Tools/pynche/ChipViewer.py	(original)
+++ python/trunk/Tools/pynche/ChipViewer.py	Sat Feb 23 18:40:11 2008
@@ -13,7 +13,6 @@
 selected and nearest ChipWidgets.
 """
 
-from types import StringType
 from Tkinter import *
 import ColorDB
 

Modified: python/trunk/Tools/pynche/TypeinViewer.py
==============================================================================
--- python/trunk/Tools/pynche/TypeinViewer.py	(original)
+++ python/trunk/Tools/pynche/TypeinViewer.py	Sat Feb 23 18:40:11 2008
@@ -12,8 +12,6 @@
 you must hit Return or Tab to select the color.
 """
 
-import sys
-import re
 from Tkinter import *
 
 

Modified: python/trunk/Tools/scripts/logmerge.py
==============================================================================
--- python/trunk/Tools/scripts/logmerge.py	(original)
+++ python/trunk/Tools/scripts/logmerge.py	Sat Feb 23 18:40:11 2008
@@ -34,7 +34,7 @@
 from their output.
 """
 
-import os, sys, errno, getopt, re
+import sys, errno, getopt, re
 
 sep1 = '='*77 + '\n'                    # file separator
 sep2 = '-'*28 + '\n'                    # revision separator

Modified: python/trunk/Tools/scripts/nm2def.py
==============================================================================
--- python/trunk/Tools/scripts/nm2def.py	(original)
+++ python/trunk/Tools/scripts/nm2def.py	Sat Feb 23 18:40:11 2008
@@ -34,7 +34,7 @@
 option to produce this format (since it is the original v7 Unix format).
 
 """
-import os,re,sys
+import os, sys
 
 PYTHONLIB = 'libpython'+sys.version[:3]+'.a'
 PC_PYTHONLIB = 'Python'+sys.version[0]+sys.version[2]+'.dll'

Modified: python/trunk/Tools/scripts/pindent.py
==============================================================================
--- python/trunk/Tools/scripts/pindent.py	(original)
+++ python/trunk/Tools/scripts/pindent.py	Sat Feb 23 18:40:11 2008
@@ -81,7 +81,6 @@
 TABSIZE = 8
 EXPANDTABS = 0
 
-import os
 import re
 import sys
 

Modified: python/trunk/Tools/scripts/pysource.py
==============================================================================
--- python/trunk/Tools/scripts/pysource.py	(original)
+++ python/trunk/Tools/scripts/pysource.py	Sat Feb 23 18:40:11 2008
@@ -20,7 +20,7 @@
 __all__ = ["has_python_ext", "looks_like_python", "can_be_compiled", "walk_python_files"]
 
 
-import sys, os, re
+import os, re
 
 binary_re = re.compile('[\x00-\x08\x0E-\x1F\x7F]')
 

Modified: python/trunk/Tools/scripts/xxci.py
==============================================================================
--- python/trunk/Tools/scripts/xxci.py	(original)
+++ python/trunk/Tools/scripts/xxci.py	Sat Feb 23 18:40:11 2008
@@ -7,7 +7,6 @@
 import sys
 import os
 from stat import *
-import commands
 import fnmatch
 
 EXECMAGIC = '\001\140\000\010'

Modified: python/trunk/Tools/ssl/get-remote-certificate.py
==============================================================================
--- python/trunk/Tools/ssl/get-remote-certificate.py	(original)
+++ python/trunk/Tools/ssl/get-remote-certificate.py	Sat Feb 23 18:40:11 2008
@@ -6,7 +6,7 @@
 #
 # By Bill Janssen.
 
-import sys, os
+import sys
 
 def fetch_server_certificate (host, port):
 

Modified: python/trunk/Tools/unicode/gencodec.py
==============================================================================
--- python/trunk/Tools/unicode/gencodec.py	(original)
+++ python/trunk/Tools/unicode/gencodec.py	Sat Feb 23 18:40:11 2008
@@ -26,7 +26,7 @@
 
 """#"
 
-import re, os, time, marshal, codecs
+import re, os, marshal, codecs
 
 # Maximum allowed size of charmap tables
 MAX_TABLE_SIZE = 8192

Modified: python/trunk/Tools/webchecker/wcgui.py
==============================================================================
--- python/trunk/Tools/webchecker/wcgui.py	(original)
+++ python/trunk/Tools/webchecker/wcgui.py	Sat Feb 23 18:40:11 2008
@@ -63,7 +63,6 @@
 from Tkinter import *
 import tktools
 import webchecker
-import random
 
 # Override some for a weaker platform
 if sys.platform == 'mac':

Modified: python/trunk/Tools/webchecker/wsgui.py
==============================================================================
--- python/trunk/Tools/webchecker/wsgui.py	(original)
+++ python/trunk/Tools/webchecker/wsgui.py	Sat Feb 23 18:40:11 2008
@@ -7,9 +7,7 @@
 """
 
 from Tkinter import *
-import Tkinter
 import websucker
-import sys
 import os
 import threading
 import Queue
