2002年7月23日 12:05:18 -0700

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv26271/Lib/test
Modified Files:
	README regrtest.py test_StringIO.py test___future__.py 
	test_anydbm.py test_array.py test_audioop.py test_base64.py 
	test_binhex.py test_binop.py test_bool.py test_calendar.py 
	test_call.py test_capi.py test_cmath.py test_codecs.py 
	test_codeop.py test_commands.py test_compile.py test_cookie.py 
	test_copy_reg.py test_cpickle.py test_crypt.py test_curses.py 
	test_dbm.py test_descr.py test_descrtut.py test_difflib.py 
	test_dircache.py test_dl.py test_doctest.py test_doctest2.py 
	test_dospath.py test_dumbdbm.py test_enumerate.py 
	test_errno.py test_fcntl.py test_fileinput.py test_fnmatch.py 
	test_format.py test_fpformat.py test_future.py test_gc.py 
	test_gdbm.py test_generators.py test_getopt.py test_glob.py 
	test_grp.py test_hash.py test_hmac.py test_hotshot.py 
	test_htmllib.py test_htmlparser.py test_imageop.py 
	test_imgfile.py test_import.py test_inspect.py 
	test_isinstance.py test_iter.py test_largefile.py 
	test_linuxaudiodev.py test_locale.py test_long.py 
	test_long_future.py test_mailbox.py test_marshal.py 
	test_math.py test_mhlib.py test_mimetools.py test_mimetypes.py 
	test_minidom.py test_mmap.py test_module.py test_mpz.py 
	test_mutants.py test_netrc.py test_new.py test_nis.py 
	test_ntpath.py test_opcodes.py test_openpty.py 
	test_operator.py test_os.py test_parser.py test_pickle.py 
	test_pkg.py test_pkgimport.py test_poll.py test_popen.py 
	test_popen2.py test_pow.py test_pprint.py test_profilehooks.py 
	test_pty.py test_pwd.py test_pyclbr.py test_pyexpat.py 
	test_queue.py test_quopri.py test_random.py test_re.py 
	test_regex.py test_repr.py test_resource.py test_rfc822.py 
	test_rgbimg.py test_richcmp.py test_robotparser.py test_sax.py 
	test_scope.py test_select.py test_sgmllib.py test_sha.py 
	test_signal.py test_slice.py test_socket.py test_socket_ssl.py 
	test_socketserver.py test_softspace.py test_sre.py 
	test_strftime.py test_string.py test_strop.py test_struct.py 
	test_structseq.py test_sunaudiodev.py test_sundry.py 
	test_symtable.py test_syntax.py test_thread.py 
	test_threaded_import.py test_threadedtempfile.py 
	test_threading.py test_time.py test_timeout.py test_timing.py 
	test_tokenize.py test_traceback.py test_types.py test_ucn.py 
	test_unary.py test_unicode.py test_unicode_file.py 
	test_unicodedata.py test_univnewlines.py test_unpack.py 
	test_urllib.py test_urllib2.py test_urlparse.py 
	test_userdict.py test_userlist.py test_userstring.py 
	test_uu.py test_wave.py test_weakref.py test_winreg.py 
	test_xmllib.py test_xmlrpc.py test_xreadline.py 
	test_zipfile.py test_zlib.py 
Log Message:
Get rid of relative imports in all unittests. Now anything that
imports e.g. test_support must do so using an absolute package name
such as "import test.test_support" or "from test import test_support".
This also updates the README in Lib/test, and gets rid of the
duplicate data dirctory in Lib/test/data (replaced by
Lib/email/test/data).
Now Tim and Jack can have at it. :)
Index: README
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/README,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** README	23 Apr 2002 21:39:00 -0000	1.13
--- README	23 Jul 2002 19:03:42 -0000	1.14
***************
*** 53,57 ****

 import unittest
! import test_support

 class MyTestCase1(unittest.TestCase):
--- 53,57 ----

 import unittest
! from test import test_support

 class MyTestCase1(unittest.TestCase):
***************
*** 249,253 ****

 * If your test case detects a failure, raise TestFailed (found in
! test_support).

 * Import everything you'll need as early as possible.
--- 249,253 ----

 * If your test case detects a failure, raise TestFailed (found in
! test.test_support).

 * Import everything you'll need as early as possible.
***************
*** 276,281 ****
 Miscellaneous

! There is a test_support module you can import from your test case. It
! provides the following useful objects:

 * TestFailed - raise this exception when your regression test detects a
--- 276,289 ----
 Miscellaneous

! There is a test_support module in the test package you can import from
! your test case. Import this module using either
! 
! import test.test_support
! 
! or
! 
! from test import test_support
! 
! test_support provides the following useful objects:

 * TestFailed - raise this exception when your regression test detects a
***************
*** 318,343 ****
 numbers when you expect them to only be approximately equal withing a
 fuzz factor (test_support.FUZZ, which defaults to 1e-6).
- 
- NOTE: Always import something from test_support like so:
- 
- from test_support import verbose
- 
- or like so:
- 
- import test_support
- ... use test_support.verbose in the code ...
- 
- Never import anything from test_support like this:
- 
- from test.test_support import verbose
- 
- "test" is a package already, so can refer to modules it contains without
- "test." qualification. If you do an explicit "test.xxx" qualification, that
- can fool Python into believing test.xxx is a module distinct from the xxx
- in the current package, and you can end up importing two distinct copies of
- xxx. This is especially bad if xxx=test_support, as regrtest.py can (and
- routinely does) overwrite its "verbose" and "use_large_resources"
- attributes: if you get a second copy of test_support loaded, it may not
- have the same values for those as regrtest intended.

--- 326,329 ----
Index: regrtest.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/regrtest.py,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** regrtest.py	17 Jul 2002 15:56:55 -0000	1.90
--- regrtest.py	23 Jul 2002 19:03:43 -0000	1.91
***************
*** 65,70 ****
 import StringIO

! import test_support
! 

 RESOURCE_NAMES = ('curses', 'largefile', 'network')
--- 65,69 ----
 import StringIO

! from test import test_support

 RESOURCE_NAMES = ('curses', 'largefile', 'network')
Index: test_StringIO.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_StringIO.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** test_StringIO.py	13 May 2002 09:42:16 -0000	1.13
--- test_StringIO.py	23 Jul 2002 19:03:43 -0000	1.14
***************
*** 5,9 ****
 import cStringIO
 import types
! import test_support

--- 5,9 ----
 import cStringIO
 import types
! from test import test_support

Index: test___future__.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test___future__.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test___future__.py	18 Aug 2001 20:18:49 -0000	1.4
--- test___future__.py	23 Jul 2002 19:03:43 -0000	1.5
***************
*** 1,4 ****
 #! /usr/bin/env python
! from test_support import verbose, verify
 from types import TupleType, StringType, IntType
 import __future__
--- 1,4 ----
 #! /usr/bin/env python
! from test.test_support import verbose, verify
 from types import TupleType, StringType, IntType
 import __future__
Index: test_anydbm.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_anydbm.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_anydbm.py	18 Mar 2002 03:00:37 -0000	1.1
--- test_anydbm.py	23 Jul 2002 19:03:43 -0000	1.2
***************
*** 5,13 ****

 import os
- import test_support
 import unittest
 import anydbm
 import tempfile
 import glob

 _fname = tempfile.mktemp()
--- 5,13 ----

 import os
 import unittest
 import anydbm
 import tempfile
 import glob
+ from test import test_support

 _fname = tempfile.mktemp()
Index: test_array.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_array.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** test_array.py	19 Jun 2002 15:44:15 -0000	1.16
--- test_array.py	23 Jul 2002 19:03:43 -0000	1.17
***************
*** 4,8 ****
 """
 import array
! from test_support import verbose, TESTFN, unlink, TestFailed,\
 have_unicode, vereq

--- 4,8 ----
 """
 import array
! from test.test_support import verbose, TESTFN, unlink, TestFailed,\
 have_unicode, vereq

Index: test_audioop.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_audioop.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** test_audioop.py	4 Sep 2001 19:14:14 -0000	1.10
--- test_audioop.py	23 Jul 2002 19:03:44 -0000	1.11
***************
*** 1,5 ****
 # Test audioop.
 import audioop
! from test_support import verbose

 def gendata1():
--- 1,5 ----
 # Test audioop.
 import audioop
! from test.test_support import verbose

 def gendata1():
Index: test_base64.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_base64.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_base64.py	23 May 2002 15:15:30 -0000	1.2
--- test_base64.py	23 Jul 2002 19:03:45 -0000	1.3
***************
*** 1,4 ****
 import unittest
! import test_support
 import base64
 from binascii import Error as binascii_error
--- 1,4 ----
 import unittest
! from test import test_support
 import base64
 from binascii import Error as binascii_error
Index: test_binhex.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_binhex.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** test_binhex.py	20 Sep 2001 21:33:42 -0000	1.12
--- test_binhex.py	23 Jul 2002 19:03:45 -0000	1.13
***************
*** 8,13 ****
 import os
 import tempfile
- import test_support
 import unittest

--- 8,13 ----
 import os
 import tempfile
 import unittest
+ from test import test_support

Index: test_binop.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_binop.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_binop.py	20 Sep 2001 21:33:42 -0000	1.6
--- test_binop.py	23 Jul 2002 19:03:45 -0000	1.7
***************
*** 1,6 ****
 """Tests for binary operators on subtypes of built-in types."""

- import test_support
 import unittest

 def gcd(a, b):
--- 1,6 ----
 """Tests for binary operators on subtypes of built-in types."""

 import unittest
+ from test import test_support

 def gcd(a, b):
Index: test_bool.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_bool.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_bool.py	11 Jun 2002 10:55:09 -0000	1.6
--- test_bool.py	23 Jul 2002 19:03:45 -0000	1.7
***************
*** 1,5 ****
 # Test properties of bool promised by PEP 285

! from test_support import verbose, TestFailed, TESTFN, vereq, have_unicode
 import os

--- 1,5 ----
 # Test properties of bool promised by PEP 285

! from test.test_support import verbose, TestFailed, TESTFN, vereq, have_unicode
 import os

Index: test_calendar.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_calendar.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_calendar.py	23 Mar 2002 03:26:53 -0000	1.3
--- test_calendar.py	23 Jul 2002 19:03:45 -0000	1.4
***************
*** 2,6 ****
 import unittest

! from test_support import run_unittest

--- 2,6 ----
 import unittest

! from test.test_support import run_unittest

Index: test_call.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_call.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_call.py	20 Sep 2001 21:33:42 -0000	1.2
--- test_call.py	23 Jul 2002 19:03:45 -0000	1.3
***************
*** 1,4 ****
 import unittest
! from test_support import run_unittest

 # The test cases here cover several paths through the function calling
--- 1,4 ----
 import unittest
! from test.test_support import run_unittest

 # The test cases here cover several paths through the function calling
Index: test_capi.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_capi.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_capi.py	13 Apr 2001 17:03:04 -0000	1.3
--- test_capi.py	23 Jul 2002 19:03:45 -0000	1.4
***************
*** 3,7 ****

 import sys
! import test_support
 import _testcapi

--- 3,7 ----

 import sys
! from test import test_support
 import _testcapi

Index: test_cmath.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_cmath.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_cmath.py	17 Jan 2001 21:51:35 -0000	1.6
--- test_cmath.py	23 Jul 2002 19:03:46 -0000	1.7
***************
*** 4,8 ****
 """
 import cmath
! from test_support import verbose

 testdict = {'acos' : 1.0,
--- 4,8 ----
 """
 import cmath
! from test.test_support import verbose

 testdict = {'acos' : 1.0,
Index: test_codecs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_codecs.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_codecs.py	20 Sep 2001 21:33:42 -0000	1.2
--- test_codecs.py	23 Jul 2002 19:03:46 -0000	1.3
***************
*** 1,3 ****
! import test_support,unittest
 import codecs
 import StringIO
--- 1,4 ----
! from test import test_support
! import unittest
 import codecs
 import StringIO
Index: test_codeop.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_codeop.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_codeop.py	20 Sep 2001 21:33:42 -0000	1.3
--- test_codeop.py	23 Jul 2002 19:03:46 -0000	1.4
***************
*** 4,8 ****
 """
 import unittest
! from test_support import run_unittest

 from codeop import compile_command
--- 4,8 ----
 """
 import unittest
! from test.test_support import run_unittest

 from codeop import compile_command
Index: test_commands.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_commands.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_commands.py	6 Jun 2002 09:52:49 -0000	1.5
--- test_commands.py	23 Jul 2002 19:03:46 -0000	1.6
***************
*** 6,10 ****
 import os, tempfile, re

! from test_support import TestSkipped, run_unittest
 from commands import *

--- 6,10 ----
 import os, tempfile, re

! from test.test_support import TestSkipped, run_unittest
 from commands import *

Index: test_compile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_compile.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_compile.py	9 Jul 2002 09:23:26 -0000	1.11
--- test_compile.py	23 Jul 2002 19:03:46 -0000	1.12
***************
*** 1,3 ****
! from test_support import verbose, TestFailed

 if verbose:
--- 1,3 ----
! from test.test_support import verbose, TestFailed

 if verbose:
Index: test_cookie.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_cookie.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_cookie.py	9 Sep 2001 06:12:01 -0000	1.11
--- test_cookie.py	23 Jul 2002 19:03:46 -0000	1.12
***************
*** 1,5 ****
 # Simple test suite for Cookie.py

! from test_support import verify, verbose, run_doctest
 import Cookie

--- 1,5 ----
 # Simple test suite for Cookie.py

! from test.test_support import verify, verbose, run_doctest
 import Cookie

Index: test_copy_reg.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_copy_reg.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_copy_reg.py	20 Sep 2001 21:33:42 -0000	1.3
--- test_copy_reg.py	23 Jul 2002 19:03:46 -0000	1.4
***************
*** 1,5 ****
 import copy_reg
- import test_support
 import unittest

--- 1,5 ----
 import copy_reg
 import unittest
+ from test import test_support

Index: test_cpickle.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_cpickle.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_cpickle.py	21 Dec 2001 20:04:22 -0000	1.11
--- test_cpickle.py	23 Jul 2002 19:03:46 -0000	1.12
***************
*** 1,7 ****
 import cPickle
- import test_support
 import unittest
 from cStringIO import StringIO
 from pickletester import AbstractPickleTests, AbstractPickleModuleTests

 class cPickleTests(AbstractPickleTests, AbstractPickleModuleTests):
--- 1,7 ----
 import cPickle
 import unittest
 from cStringIO import StringIO
 from pickletester import AbstractPickleTests, AbstractPickleModuleTests
+ from test import test_support

 class cPickleTests(AbstractPickleTests, AbstractPickleModuleTests):
Index: test_crypt.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_crypt.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_crypt.py	18 Jan 2001 02:22:22 -0000	1.6
--- test_crypt.py	23 Jul 2002 19:03:47 -0000	1.7
***************
*** 4,8 ****
 """

! from test_support import verify, verbose
 import crypt

--- 4,8 ----
 """

! from test.test_support import verify, verbose
 import crypt

Index: test_curses.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_curses.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_curses.py	22 Oct 2001 15:26:09 -0000	1.1
--- test_curses.py	23 Jul 2002 19:03:47 -0000	1.2
***************
*** 15,19 ****
 # option. If not available, nothing after this line will be executed.

! import test_support
 test_support.requires('curses')

--- 15,19 ----
 # option. If not available, nothing after this line will be executed.

! from test import test_support
 test_support.requires('curses')

Index: test_dbm.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_dbm.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test_dbm.py	22 Mar 2001 00:39:45 -0000	1.7
--- test_dbm.py	23 Jul 2002 19:03:47 -0000	1.8
***************
*** 5,9 ****
 import dbm
 from dbm import error
! from test_support import verbose, verify

 filename = '/tmp/delete_me'
--- 5,9 ----
 import dbm
 from dbm import error
! from test.test_support import verbose, verify

 filename = '/tmp/delete_me'
Index: test_descr.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_descr.py,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -d -r1.148 -r1.149
*** test_descr.py	11 Jul 2002 18:39:56 -0000	1.148
--- test_descr.py	23 Jul 2002 19:03:47 -0000	1.149
***************
*** 1,5 ****
 # Test enhancements related to descriptors and new-style classes

! from test_support import verify, vereq, verbose, TestFailed, TESTFN
 from copy import deepcopy
 import warnings
--- 1,5 ----
 # Test enhancements related to descriptors and new-style classes

! from test.test_support import verify, vereq, verbose, TestFailed, TESTFN
 from copy import deepcopy
 import warnings
Index: test_descrtut.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_descrtut.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** test_descrtut.py	31 May 2002 21:40:38 -0000	1.13
--- test_descrtut.py	23 Jul 2002 19:03:48 -0000	1.14
***************
*** 9,13 ****
 # deterministic.

! from test_support import sortdict
 import pprint

--- 9,13 ----
 # deterministic.

! from test.test_support import sortdict
 import pprint

***************
*** 495,500 ****
 # business is used the name can change depending on how the test is
 # invoked.
! import test_support, test.test_descrtut
! test_support.run_doctest(test.test_descrtut, verbose)

 # This part isn't needed for regrtest, but for running the test directly.
--- 495,500 ----
 # business is used the name can change depending on how the test is
 # invoked.
! from test import test_support, test_descrtut
! test_support.run_doctest(test_descrtut, verbose)

 # This part isn't needed for regrtest, but for running the test directly.
Index: test_difflib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_difflib.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_difflib.py	9 Sep 2001 06:12:01 -0000	1.4
--- test_difflib.py	23 Jul 2002 19:03:48 -0000	1.5
***************
*** 1,2 ****
! import difflib, test_support
 test_support.run_doctest(difflib)
--- 1,3 ----
! import difflib
! from test import test_support
 test_support.run_doctest(difflib)
Index: test_dircache.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_dircache.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_dircache.py	20 Sep 2001 21:33:42 -0000	1.4
--- test_dircache.py	23 Jul 2002 19:03:50 -0000	1.5
***************
*** 5,9 ****

 import unittest
! from test_support import run_unittest, TESTFN
 import dircache, os, time, sys

--- 5,9 ----

 import unittest
! from test.test_support import run_unittest, TESTFN
 import dircache, os, time, sys

Index: test_dl.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_dl.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_dl.py	27 Feb 2001 20:54:23 -0000	1.11
--- test_dl.py	23 Jul 2002 19:03:50 -0000	1.12
***************
*** 5,9 ****

 import dl
! from test_support import verbose,TestSkipped

 sharedlibs = [
--- 5,9 ----

 import dl
! from test.test_support import verbose,TestSkipped

 sharedlibs = [
Index: test_doctest.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_doctest.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_doctest.py	18 Sep 2001 02:26:39 -0000	1.4
--- test_doctest.py	23 Jul 2002 19:03:50 -0000	1.5
***************
*** 1,2 ****
! import doctest, test_support
 test_support.run_doctest(doctest)
--- 1,3 ----
! import doctest
! from test import test_support
 test_support.run_doctest(doctest)
Index: test_doctest2.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_doctest2.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_doctest2.py	4 Oct 2001 05:27:00 -0000	1.3
--- test_doctest2.py	23 Jul 2002 19:03:50 -0000	1.4
***************
*** 6,10 ****
 """

! import test_support

 class C(object):
--- 6,10 ----
 """

! from test import test_support

 class C(object):
Index: test_dospath.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_dospath.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_dospath.py	20 Sep 2001 21:33:42 -0000	1.5
--- test_dospath.py	23 Jul 2002 19:03:50 -0000	1.6
***************
*** 1,5 ****
 import dospath
- import test_support
 import unittest

--- 1,5 ----
 import dospath
 import unittest
+ from test import test_support

Index: test_dumbdbm.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_dumbdbm.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_dumbdbm.py	17 Mar 2002 23:03:42 -0000	1.6
--- test_dumbdbm.py	23 Jul 2002 19:03:50 -0000	1.7
***************
*** 5,12 ****

 import os
- import test_support
 import unittest
 import dumbdbm
 import tempfile

 _fname = tempfile.mktemp()
--- 5,12 ----

 import os
 import unittest
 import dumbdbm
 import tempfile
+ from test import test_support

 _fname = tempfile.mktemp()
Index: test_enumerate.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_enumerate.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_enumerate.py	20 Jun 2002 14:52:37 -0000	1.2
--- test_enumerate.py	23 Jul 2002 19:03:50 -0000	1.3
***************
*** 1,5 ****
 import unittest

! import test_support

 seq, res = 'abc', [(0,'a'), (1,'b'), (2,'c')]
--- 1,5 ----
 import unittest

! from test import test_support

 seq, res = 'abc', [(0,'a'), (1,'b'), (2,'c')]
Index: test_errno.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_errno.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test_errno.py	17 Jan 2001 21:51:35 -0000	1.7
--- test_errno.py	23 Jul 2002 19:03:51 -0000	1.8
***************
*** 5,9 ****

 import errno
! from test_support import verbose

 errors = ['E2BIG', 'EACCES', 'EADDRINUSE', 'EADDRNOTAVAIL', 'EADV',
--- 5,9 ----

 import errno
! from test.test_support import verbose

 errors = ['E2BIG', 'EACCES', 'EADDRINUSE', 'EADDRNOTAVAIL', 'EADV',
Index: test_fcntl.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_fcntl.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** test_fcntl.py	11 Jun 2002 06:22:30 -0000	1.23
--- test_fcntl.py	23 Jul 2002 19:03:51 -0000	1.24
***************
*** 7,11 ****
 import fcntl
 import os, sys
! from test_support import verbose, TESTFN

 filename = TESTFN
--- 7,11 ----
 import fcntl
 import os, sys
! from test.test_support import verbose, TESTFN

 filename = TESTFN
Index: test_fileinput.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_fileinput.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_fileinput.py	11 Jul 2001 22:21:17 -0000	1.1
--- test_fileinput.py	23 Jul 2002 19:03:52 -0000	1.2
***************
*** 4,8 ****
 '''

! from test_support import verify, verbose, TESTFN
 import sys, os, re
 from StringIO import StringIO
--- 4,8 ----
 '''

! from test.test_support import verify, verbose, TESTFN
 import sys, os, re
 from StringIO import StringIO
Index: test_fnmatch.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_fnmatch.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_fnmatch.py	20 Sep 2001 21:33:42 -0000	1.3
--- test_fnmatch.py	23 Jul 2002 19:03:53 -0000	1.4
***************
*** 1,5 ****
 """Test cases for the fnmatch module."""

! import test_support
 import unittest

--- 1,5 ----
 """Test cases for the fnmatch module."""

! from test import test_support
 import unittest

Index: test_format.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_format.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** test_format.py	17 Aug 2001 22:08:34 -0000	1.13
--- test_format.py	23 Jul 2002 19:03:53 -0000	1.14
***************
*** 1,3 ****
! from test_support import verbose, have_unicode
 import sys

--- 1,3 ----
! from test.test_support import verbose, have_unicode
 import sys

Index: test_fpformat.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_fpformat.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_fpformat.py	20 Sep 2001 21:33:42 -0000	1.4
--- test_fpformat.py	23 Jul 2002 19:03:53 -0000	1.5
***************
*** 3,7 ****
 Nick Mathewson
 '''
! from test_support import run_unittest
 import unittest
 from fpformat import fix, sci, NotANumber
--- 3,7 ----
 Nick Mathewson
 '''
! from test.test_support import run_unittest
 import unittest
 from fpformat import fix, sci, NotANumber
Index: test_future.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_future.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_future.py	20 Aug 2001 20:33:42 -0000	1.4
--- test_future.py	23 Jul 2002 19:03:53 -0000	1.5
***************
*** 1,5 ****
 # Test various flavors of legal and illegal future statements

! from test_support import unload
 import re

--- 1,5 ----
 # Test various flavors of legal and illegal future statements

! from test.test_support import unload
 import re

Index: test_gc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_gc.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** test_gc.py	11 Jul 2002 19:07:45 -0000	1.17
--- test_gc.py	23 Jul 2002 19:03:53 -0000	1.18
***************
*** 1,3 ****
! from test_support import verify, verbose, TestFailed
 import sys
 import gc
--- 1,3 ----
! from test.test_support import verify, verbose, TestFailed
 import sys
 import gc
Index: test_gdbm.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_gdbm.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_gdbm.py	22 Mar 2001 00:40:23 -0000	1.8
--- test_gdbm.py	23 Jul 2002 19:03:53 -0000	1.9
***************
*** 6,10 ****
 import gdbm
 from gdbm import error
! from test_support import verbose, verify, TestFailed

 filename= '/tmp/delete_me'
--- 6,10 ----
 import gdbm
 from gdbm import error
! from test.test_support import verbose, verify, TestFailed

 filename= '/tmp/delete_me'
Index: test_generators.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_generators.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** test_generators.py	16 Jul 2002 21:35:23 -0000	1.35
--- test_generators.py	23 Jul 2002 19:03:54 -0000	1.36
***************
*** 484,487 ****
--- 484,488 ----
 A->G B->G C->G D->G E->G F->G G->G H->G I->G J->G K->G L->G M->G
 """
+ # Emacs turd '

 # Fun tests (for sufficiently warped notions of "fun").
***************
*** 1371,1375 ****
 # so this works as expected in both ways of running regrtest.
 def test_main(verbose=None):
! import doctest, test_support, test_generators
 if 0: # change to 1 to run forever (to check for leaks)
 while 1:
--- 1372,1377 ----
 # so this works as expected in both ways of running regrtest.
 def test_main(verbose=None):
! import doctest
! from test import test_support, test_generators
 if 0: # change to 1 to run forever (to check for leaks)
 while 1:
Index: test_getopt.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_getopt.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_getopt.py	6 Jun 2002 10:58:36 -0000	1.5
--- test_getopt.py	23 Jul 2002 19:03:54 -0000	1.6
***************
*** 4,8 ****
 import getopt
 from getopt import GetoptError
! from test_support import verify, verbose
 import os

--- 4,8 ----
 import getopt
 from getopt import GetoptError
! from test.test_support import verify, verbose
 import os

Index: test_glob.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_glob.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_glob.py	20 Sep 2001 21:33:42 -0000	1.3
--- test_glob.py	23 Jul 2002 19:03:54 -0000	1.4
***************
*** 1,4 ****
 import unittest
! from test_support import run_unittest, TESTFN
 import glob
 import os
--- 1,4 ----
 import unittest
! from test.test_support import run_unittest, TESTFN
 import glob
 import os
Index: test_grp.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_grp.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** test_grp.py	20 Sep 2001 21:33:42 -0000	1.9
--- test_grp.py	23 Jul 2002 19:03:54 -0000	1.10
***************
*** 4,9 ****

 import grp
- import test_support
 import unittest

--- 4,9 ----

 import grp
 import unittest
+ from test import test_support

Index: test_hash.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_hash.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_hash.py	20 Sep 2001 21:33:42 -0000	1.5
--- test_hash.py	23 Jul 2002 19:03:54 -0000	1.6
***************
*** 3,8 ****
 #

- import test_support
 import unittest

--- 3,8 ----
 #

 import unittest
+ from test import test_support

Index: test_hmac.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_hmac.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_hmac.py	1 Apr 2002 19:00:50 -0000	1.4
--- test_hmac.py	23 Jul 2002 19:03:54 -0000	1.5
***************
*** 1,5 ****
 import hmac
 import unittest
! import test_support

 class TestVectorsTestCase(unittest.TestCase):
--- 1,5 ----
 import hmac
 import unittest
! from test import test_support

 class TestVectorsTestCase(unittest.TestCase):
Index: test_hotshot.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_hotshot.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** test_hotshot.py	18 Jul 2002 14:54:28 -0000	1.9
--- test_hotshot.py	23 Jul 2002 19:03:54 -0000	1.10
***************
*** 5,9 ****
 import unittest

! import test_support

 from hotshot.log import ENTER, EXIT, LINE
--- 5,9 ----
 import unittest

! from test import test_support

 from hotshot.log import ENTER, EXIT, LINE
Index: test_htmllib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_htmllib.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_htmllib.py	4 Oct 2001 20:05:10 -0000	1.1
--- test_htmllib.py	23 Jul 2002 19:03:54 -0000	1.2
***************
*** 3,7 ****
 import unittest

! import test_support

--- 3,7 ----
 import unittest

! from test import test_support

Index: test_htmlparser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_htmlparser.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_htmlparser.py	3 Dec 2001 16:44:09 -0000	1.8
--- test_htmlparser.py	23 Jul 2002 19:03:54 -0000	1.9
***************
*** 4,9 ****
 import pprint
 import sys
- import test_support
 import unittest

--- 4,9 ----
 import pprint
 import sys
 import unittest
+ from test import test_support

Index: test_imageop.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_imageop.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** test_imageop.py	24 Oct 2001 20:32:02 -0000	1.12
--- test_imageop.py	23 Jul 2002 19:03:54 -0000	1.13
***************
*** 6,10 ****
 """

! from test_support import verbose, unlink

 import imageop, uu, os
--- 6,10 ----
 """

! from test.test_support import verbose, unlink

 import imageop, uu, os
Index: test_imgfile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_imgfile.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_imgfile.py	9 Feb 2001 17:05:53 -0000	1.11
--- test_imgfile.py	23 Jul 2002 19:03:54 -0000	1.12
***************
*** 5,9 ****
 """

! from test_support import verbose, unlink, findfile

 import imgfile, uu, os
--- 5,9 ----
 """

! from test.test_support import verbose, unlink, findfile

 import imgfile, uu, os
Index: test_import.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_import.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** test_import.py	8 Jul 2002 10:07:25 -0000	1.16
--- test_import.py	23 Jul 2002 19:03:55 -0000	1.17
***************
*** 1,3 ****
! from test_support import TESTFN, TestFailed

 import os
--- 1,3 ----
! from test.test_support import TESTFN, TestFailed

 import os
Index: test_inspect.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_inspect.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test_inspect.py	15 Oct 2001 22:52:25 -0000	1.7
--- test_inspect.py	23 Jul 2002 19:03:55 -0000	1.8
***************
*** 63,67 ****
 # getargvalues, formatargspec, formatargvalues, currentframe, stack, trace

! from test_support import TestFailed, TESTFN
 import sys, imp, os, string

--- 63,67 ----
 # getargvalues, formatargspec, formatargvalues, currentframe, stack, trace

! from test.test_support import TestFailed, TESTFN
 import sys, imp, os, string

Index: test_isinstance.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_isinstance.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_isinstance.py	23 May 2002 15:15:30 -0000	1.3
--- test_isinstance.py	23 Jul 2002 19:03:55 -0000	1.4
***************
*** 4,8 ****

 import unittest
! import test_support

--- 4,8 ----

 import unittest
! from test import test_support

Index: test_iter.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_iter.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** test_iter.py	16 Jul 2002 21:48:11 -0000	1.25
--- test_iter.py	23 Jul 2002 19:03:55 -0000	1.26
***************
*** 2,6 ****

 import unittest
! from test_support import run_unittest, TESTFN, unlink, have_unicode

 # Test result of triple loop (too big to inline)
--- 2,6 ----

 import unittest
! from test.test_support import run_unittest, TESTFN, unlink, have_unicode

 # Test result of triple loop (too big to inline)
Index: test_largefile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_largefile.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** test_largefile.py	12 Mar 2002 03:04:44 -0000	1.14
--- test_largefile.py	23 Jul 2002 19:03:55 -0000	1.15
***************
*** 6,10 ****
 #----------------------------------------------------------------------

! import test_support
 import os, struct, stat, sys

--- 6,10 ----
 #----------------------------------------------------------------------

! from test import test_support
 import os, struct, stat, sys

Index: test_linuxaudiodev.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_linuxaudiodev.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test_linuxaudiodev.py	23 Apr 2002 02:20:46 -0000	1.7
--- test_linuxaudiodev.py	23 Jul 2002 19:03:56 -0000	1.8
***************
*** 1,3 ****
! from test_support import verbose, findfile, TestFailed, TestSkipped

 import errno
--- 1,3 ----
! from test.test_support import verbose, findfile, TestFailed, TestSkipped

 import errno
Index: test_locale.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_locale.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_locale.py	2 May 2001 05:54:44 -0000	1.3
--- test_locale.py	23 Jul 2002 19:03:56 -0000	1.4
***************
*** 1,3 ****
! from test_support import verbose
 import locale
 import sys
--- 1,3 ----
! from test.test_support import verbose
 import locale
 import sys
Index: test_long.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_long.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** test_long.py	1 Apr 2002 19:01:39 -0000	1.16
--- test_long.py	23 Jul 2002 19:03:56 -0000	1.17
***************
*** 1,3 ****
! from test_support import verify, verbose, TestFailed, fcmp
 from string import join
 from random import random, randint
--- 1,3 ----
! from test.test_support import verify, verbose, TestFailed, fcmp
 from string import join
 from random import random, randint
Index: test_long_future.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_long_future.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_long_future.py	7 Sep 2001 00:47:00 -0000	1.4
--- test_long_future.py	23 Jul 2002 19:03:56 -0000	1.5
***************
*** 4,8 ****
 # trick just part of test_long into using future division.

! from test_support import TestFailed, verify, verbose

 def test_true_division():
--- 4,8 ----
 # trick just part of test_long into using future division.

! from test.test_support import TestFailed, verify, verbose

 def test_true_division():
Index: test_mailbox.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_mailbox.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_mailbox.py	24 Oct 2001 20:32:02 -0000	1.8
--- test_mailbox.py	23 Jul 2002 19:03:56 -0000	1.9
***************
*** 1,7 ****
 import mailbox
 import os
- import test_support
 import time
 import unittest

 # cleanup earlier tests
--- 1,7 ----
 import mailbox
 import os
 import time
 import unittest
+ from test import test_support

 # cleanup earlier tests
Index: test_marshal.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_marshal.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_marshal.py	29 Aug 2001 02:28:41 -0000	1.1
--- test_marshal.py	23 Jul 2002 19:03:57 -0000	1.2
***************
*** 1,3 ****
! from test_support import TestFailed
 import marshal
 import sys
--- 1,3 ----
! from test.test_support import TestFailed
 import marshal
 import sys
Index: test_math.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_math.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** test_math.py	23 May 2002 15:15:30 -0000	1.15
--- test_math.py	23 Jul 2002 19:03:57 -0000	1.16
***************
*** 2,6 ****
 # XXXX Should not do tests around zero only

! from test_support import *

 seps='1e-05'
--- 2,6 ----
 # XXXX Should not do tests around zero only

! from test.test_support import *

 seps='1e-05'
Index: test_mhlib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_mhlib.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test_mhlib.py	11 Jun 2002 06:22:30 -0000	1.7
--- test_mhlib.py	23 Jul 2002 19:03:57 -0000	1.8
***************
*** 8,12 ****

 import unittest
! from test_support import run_unittest, TESTFN, TestSkipped
 import os, StringIO
 import sys
--- 8,12 ----

 import unittest
! from test.test_support import run_unittest, TESTFN, TestSkipped
 import os, StringIO
 import sys
Index: test_mimetools.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_mimetools.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_mimetools.py	20 Jul 2001 18:54:44 -0000	1.2
--- test_mimetools.py	23 Jul 2002 19:03:57 -0000	1.3
***************
*** 1,3 ****
! from test_support import TestFailed
 import mimetools

--- 1,3 ----
! from test.test_support import TestFailed
 import mimetools

Index: test_mimetypes.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_mimetypes.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_mimetypes.py	30 Oct 2001 05:56:40 -0000	1.4
--- test_mimetypes.py	23 Jul 2002 19:03:57 -0000	1.5
***************
*** 3,7 ****
 import unittest

! import test_support

 # Tell it we don't know about external files:
--- 3,7 ----
 import unittest

! from test import test_support

 # Tell it we don't know about external files:
Index: test_minidom.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_minidom.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** test_minidom.py	19 Jul 2002 22:16:40 -0000	1.33
--- test_minidom.py	23 Jul 2002 19:03:57 -0000	1.34
***************
*** 5,9 ****
 import traceback

! from test_support import verbose

 import xml.dom
--- 5,9 ----
 import traceback

! from test.test_support import verbose

 import xml.dom
Index: test_mmap.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_mmap.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** test_mmap.py	23 Apr 2002 23:07:28 -0000	1.22
--- test_mmap.py	23 Jul 2002 19:03:57 -0000	1.23
***************
*** 1,3 ****
! from test_support import verify, vereq, TESTFN
 import mmap
 import os, re
--- 1,3 ----
! from test.test_support import verify, vereq, TESTFN
 import mmap
 import os, re
Index: test_module.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_module.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_module.py	4 Jun 2002 06:06:54 -0000	1.2
--- test_module.py	23 Jul 2002 19:03:57 -0000	1.3
***************
*** 1,5 ****
 # Test the module type

! from test_support import verify, vereq, verbose, TestFailed

 import sys
--- 1,5 ----
 # Test the module type

! from test.test_support import verify, vereq, verbose, TestFailed

 import sys
Index: test_mpz.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_mpz.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_mpz.py	16 Apr 2002 01:38:40 -0000	1.3
--- test_mpz.py	23 Jul 2002 19:03:57 -0000	1.4
***************
*** 1,5 ****

 import mpz
! from test_support import vereq, TestFailed

 def check_conversion(num):
--- 1,5 ----

 import mpz
! from test.test_support import vereq, TestFailed

 def check_conversion(num):
Index: test_mutants.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_mutants.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_mutants.py	3 Jun 2001 04:54:32 -0000	1.6
--- test_mutants.py	23 Jul 2002 19:03:57 -0000	1.7
***************
*** 1,3 ****
! from test_support import verbose, TESTFN
 import random
 import os
--- 1,3 ----
! from test.test_support import verbose, TESTFN
 import random
 import os
Index: test_netrc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_netrc.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_netrc.py	16 Apr 2002 01:38:40 -0000	1.2
--- test_netrc.py	23 Jul 2002 19:03:57 -0000	1.3
***************
*** 1,4 ****

! import netrc, os, tempfile, test_support, unittest

 TEST_NETRC = """
--- 1,5 ----

! import netrc, os, tempfile, unittest
! from test import test_support

 TEST_NETRC = """
Index: test_new.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_new.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** test_new.py	11 Jul 2002 18:30:27 -0000	1.15
--- test_new.py	23 Jul 2002 19:03:58 -0000	1.16
***************
*** 1,3 ****
! from test_support import verbose, verify
 import sys
 import new
--- 1,3 ----
! from test.test_support import verbose, verify
 import sys
 import new
Index: test_nis.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_nis.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_nis.py	17 Jan 2001 21:51:35 -0000	1.11
--- test_nis.py	23 Jul 2002 19:03:58 -0000	1.12
***************
*** 1,3 ****
! from test_support import verbose, TestFailed, TestSkipped
 import nis

--- 1,3 ----
! from test.test_support import verbose, TestFailed, TestSkipped
 import nis

Index: test_ntpath.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_ntpath.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** test_ntpath.py	15 Jan 2002 03:46:43 -0000	1.15
--- test_ntpath.py	23 Jul 2002 19:03:58 -0000	1.16
***************
*** 1,4 ****
 import ntpath
! from test_support import verbose, TestFailed
 import os

--- 1,4 ----
 import ntpath
! from test.test_support import verbose, TestFailed
 import os

Index: test_opcodes.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_opcodes.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** test_opcodes.py	29 Jan 2001 06:21:17 -0000	1.10
--- test_opcodes.py	23 Jul 2002 19:03:58 -0000	1.11
***************
*** 1,5 ****
 # Python test set -- part 2, opcodes

! from test_support import *

--- 1,5 ----
 # Python test set -- part 2, opcodes

! from test.test_support import *

Index: test_openpty.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_openpty.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_openpty.py	17 Jan 2001 21:51:35 -0000	1.6
--- test_openpty.py	23 Jul 2002 19:03:58 -0000	1.7
***************
*** 2,6 ****

 import os
! from test_support import verbose, TestFailed, TestSkipped

 try:
--- 2,6 ----

 import os
! from test.test_support import verbose, TestFailed, TestSkipped

 try:
Index: test_operator.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_operator.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_operator.py	20 Sep 2001 21:33:42 -0000	1.8
--- test_operator.py	23 Jul 2002 19:03:58 -0000	1.9
***************
*** 2,6 ****
 import unittest

! import test_support

--- 2,6 ----
 import unittest

! from test import test_support

Index: test_os.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_os.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_os.py	11 Jun 2002 06:22:30 -0000	1.11
--- test_os.py	23 Jul 2002 19:03:58 -0000	1.12
***************
*** 10,14 ****
 warnings.filterwarnings("ignore", "tmpnam", RuntimeWarning, __name__)

! from test_support import TESTFN, run_unittest

 class TemporaryFileTests(unittest.TestCase):
--- 10,14 ----
 warnings.filterwarnings("ignore", "tmpnam", RuntimeWarning, __name__)

! from test.test_support import TESTFN, run_unittest

 class TemporaryFileTests(unittest.TestCase):
Index: test_parser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_parser.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_parser.py	1 Apr 2002 00:28:59 -0000	1.11
--- test_parser.py	23 Jul 2002 19:03:58 -0000	1.12
***************
*** 1,5 ****
 import parser
- import test_support
 import unittest

 #
--- 1,5 ----
 import parser
 import unittest
+ from test import test_support

 #
Index: test_pickle.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pickle.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** test_pickle.py	19 Dec 2001 16:42:15 -0000	1.9
--- test_pickle.py	23 Jul 2002 19:03:58 -0000	1.10
***************
*** 1,7 ****
 import pickle
- import test_support
 import unittest
 from cStringIO import StringIO
 from pickletester import AbstractPickleTests, AbstractPickleModuleTests

 class PickleTests(AbstractPickleTests, AbstractPickleModuleTests):
--- 1,7 ----
 import pickle
 import unittest
 from cStringIO import StringIO
 from pickletester import AbstractPickleTests, AbstractPickleModuleTests
+ from test import test_support

 class PickleTests(AbstractPickleTests, AbstractPickleModuleTests):
Index: test_pkg.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pkg.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** test_pkg.py	24 Oct 2001 20:32:02 -0000	1.14
--- test_pkg.py	23 Jul 2002 19:03:58 -0000	1.15
***************
*** 4,8 ****
 from os import mkdir, rmdir, extsep # Can't test if these fail
 del mkdir, rmdir
! from test_support import verify, verbose, TestFailed

 # Helpers to create and destroy hierarchies.
--- 4,8 ----
 from os import mkdir, rmdir, extsep # Can't test if these fail
 del mkdir, rmdir
! from test.test_support import verify, verbose, TestFailed

 # Helpers to create and destroy hierarchies.
Index: test_pkgimport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pkgimport.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_pkgimport.py	24 Oct 2001 20:32:02 -0000	1.5
--- test_pkgimport.py	23 Jul 2002 19:03:58 -0000	1.6
***************
*** 1,5 ****
 import os, sys, string, random, tempfile, unittest

! from test_support import run_unittest

 class TestImport(unittest.TestCase):
--- 1,5 ----
 import os, sys, string, random, tempfile, unittest

! from test.test_support import run_unittest

 class TestImport(unittest.TestCase):
Index: test_poll.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_poll.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_poll.py	17 Jan 2001 19:11:13 -0000	1.5
--- test_poll.py	23 Jul 2002 19:03:58 -0000	1.6
***************
*** 2,6 ****

 import sys, os, select, random
! from test_support import verify, verbose, TestSkipped, TESTFN

 try:
--- 2,6 ----

 import sys, os, select, random
! from test.test_support import verify, verbose, TestSkipped, TESTFN

 try:
Index: test_popen.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_popen.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_popen.py	20 Jul 2002 20:35:13 -0000	1.2
--- test_popen.py	23 Jul 2002 19:03:58 -0000	1.3
***************
*** 7,11 ****
 import os
 import sys
! from test_support import TestSkipped
 from os import popen

--- 7,11 ----
 import os
 import sys
! from test.test_support import TestSkipped
 from os import popen

Index: test_popen2.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_popen2.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_popen2.py	11 Jun 2002 06:22:30 -0000	1.6
--- test_popen2.py	23 Jul 2002 19:03:58 -0000	1.7
***************
*** 6,10 ****
 import os
 import sys
! from test_support import TestSkipped

 # popen2 contains its own testing routine
--- 6,10 ----
 import os
 import sys
! from test.test_support import TestSkipped

 # popen2 contains its own testing routine
Index: test_pow.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pow.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** test_pow.py	1 Apr 2002 19:01:39 -0000	1.14
--- test_pow.py	23 Jul 2002 19:03:58 -0000	1.15
***************
*** 1,4 ****
 import sys
! import test_support

--- 1,4 ----
 import sys
! from test import test_support

Index: test_pprint.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pprint.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_pprint.py	2 Apr 2002 05:08:35 -0000	1.8
--- test_pprint.py	23 Jul 2002 19:03:59 -0000	1.9
***************
*** 1,6 ****
 import pprint
 import unittest
! 
! import test_support

 try:
--- 1,5 ----
 import pprint
 import unittest
! from test import test_support

 try:
Index: test_profilehooks.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_profilehooks.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_profilehooks.py	1 Apr 2002 00:28:59 -0000	1.8
--- test_profilehooks.py	23 Jul 2002 19:03:59 -0000	1.9
***************
*** 1,9 ****
- from test_support import TestFailed
- 
 import pprint
 import sys
 import unittest

! import test_support

--- 1,7 ----
 import pprint
 import sys
 import unittest

! from test import test_support

***************
*** 330,336 ****

 def capture_events(callable, p=None):
! try: sys.setprofile()
! except TypeError: pass
! else: raise TestFailed, 'sys.setprofile() did not raise TypeError'

 if p is None:
--- 328,338 ----

 def capture_events(callable, p=None):
! try:
! sys.setprofile()
! except TypeError:
! pass
! else:
! raise test_support.TestFailed(
! 'sys.setprofile() did not raise TypeError')

 if p is None:
Index: test_pty.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pty.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** test_pty.py	11 Sep 2001 14:24:35 -0000	1.14
--- test_pty.py	23 Jul 2002 19:03:59 -0000	1.15
***************
*** 1,4 ****
 import pty, os, sys
! from test_support import verbose, TestFailed, TestSkipped

 TEST_STRING_1 = "I wish to buy a fish license.\n"
--- 1,4 ----
 import pty, os, sys
! from test.test_support import verbose, TestFailed, TestSkipped

 TEST_STRING_1 = "I wish to buy a fish license.\n"
Index: test_pwd.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pwd.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_pwd.py	9 Feb 2001 11:53:49 -0000	1.11
--- test_pwd.py	23 Jul 2002 19:03:59 -0000	1.12
***************
*** 1,3 ****
! from test_support import verbose
 import pwd

--- 1,3 ----
! from test.test_support import verbose
 import pwd

Index: test_pyclbr.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pyclbr.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_pyclbr.py	12 Jul 2002 15:54:37 -0000	1.11
--- test_pyclbr.py	23 Jul 2002 19:03:59 -0000	1.12
***************
*** 3,7 ****
 Nick Mathewson
 '''
! from test_support import run_unittest
 import unittest, sys
 from types import ClassType, FunctionType, MethodType
--- 3,7 ----
 Nick Mathewson
 '''
! from test.test_support import run_unittest
 import unittest, sys
 from types import ClassType, FunctionType, MethodType
Index: test_pyexpat.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pyexpat.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** test_pyexpat.py	28 Jun 2002 22:56:48 -0000	1.12
--- test_pyexpat.py	23 Jul 2002 19:03:59 -0000	1.13
***************
*** 7,11 ****
 from xml.parsers import expat

! from test_support import sortdict, TestFailed

 class Outputter:
--- 7,11 ----
 from xml.parsers import expat

! from test.test_support import sortdict, TestFailed

 class Outputter:
Index: test_queue.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_queue.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_queue.py	19 Apr 2002 00:11:32 -0000	1.1
--- test_queue.py	23 Jul 2002 19:03:59 -0000	1.2
***************
*** 6,10 ****
 import time

! from test_support import verify, TestFailed, verbose

 queue_size = 5
--- 6,10 ----
 import time

! from test.test_support import verify, TestFailed, verbose

 queue_size = 5
Index: test_quopri.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_quopri.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_quopri.py	30 Sep 2001 20:32:10 -0000	1.6
--- test_quopri.py	23 Jul 2002 19:03:59 -0000	1.7
***************
*** 1,3 ****
! import test_support
 import unittest

--- 1,3 ----
! from test import test_support
 import unittest

Index: test_random.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_random.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_random.py	5 May 2002 20:39:59 -0000	1.1
--- test_random.py	23 Jul 2002 19:03:59 -0000	1.2
***************
*** 1,3 ****
! import test_support
 import random

--- 1,3 ----
! from test import test_support
 import random

Index: test_re.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_re.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** test_re.py	10 Aug 2001 14:49:58 -0000	1.31
--- test_re.py	23 Jul 2002 19:03:59 -0000	1.32
***************
*** 2,6 ****
 sys.path = ['.'] + sys.path

! from test_support import verify, verbose, TestFailed
 import re
 import sys, os, traceback
--- 2,6 ----
 sys.path = ['.'] + sys.path

! from test.test_support import verify, verbose, TestFailed
 import re
 import sys, os, traceback
Index: test_regex.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_regex.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_regex.py	16 Apr 2002 01:27:44 -0000	1.11
--- test_regex.py	23 Jul 2002 19:03:59 -0000	1.12
***************
*** 1,3 ****
! from test_support import verbose, sortdict
 import warnings
 warnings.filterwarnings("ignore", "the regex module is deprecated",
--- 1,3 ----
! from test.test_support import verbose, sortdict
 import warnings
 warnings.filterwarnings("ignore", "the regex module is deprecated",
Index: test_repr.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_repr.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** test_repr.py	2 May 2002 18:40:31 -0000	1.13
--- test_repr.py	23 Jul 2002 19:04:00 -0000	1.14
***************
*** 8,12 ****
 import unittest

! from test_support import run_unittest
 from repr import repr as r # Don't shadow builtin repr

--- 8,12 ----
 import unittest

! from test.test_support import run_unittest
 from repr import repr as r # Don't shadow builtin repr

Index: test_resource.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_resource.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_resource.py	23 Apr 2002 20:21:21 -0000	1.1
--- test_resource.py	23 Jul 2002 19:04:00 -0000	1.2
***************
*** 2,6 ****
 import resource

! from test_support import TESTFN

 # This test is checking a few specific problem spots. RLIMIT_FSIZE
--- 2,6 ----
 import resource

! from test.test_support import TESTFN

 # This test is checking a few specific problem spots. RLIMIT_FSIZE
Index: test_rfc822.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_rfc822.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** test_rfc822.py	5 Jun 2002 19:07:39 -0000	1.18
--- test_rfc822.py	23 Jul 2002 19:04:00 -0000	1.19
***************
*** 1,6 ****
 import rfc822
 import sys
- import test_support
 import unittest

 try:
--- 1,6 ----
 import rfc822
 import sys
 import unittest
+ from test import test_support

 try:
Index: test_rgbimg.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_rgbimg.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** test_rgbimg.py	24 Oct 2001 20:32:02 -0000	1.13
--- test_rgbimg.py	23 Jul 2002 19:04:00 -0000	1.14
***************
*** 3,7 ****
 import rgbimg, os, uu

! from test_support import verbose, unlink, findfile

 class error(Exception):
--- 3,7 ----
 import rgbimg, os, uu

! from test.test_support import verbose, unlink, findfile

 class error(Exception):
Index: test_richcmp.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_richcmp.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_richcmp.py	8 May 2001 04:38:29 -0000	1.6
--- test_richcmp.py	23 Jul 2002 19:04:00 -0000	1.7
***************
*** 1,5 ****
 # Tests for rich comparisons

! from test_support import TestFailed, verify, verbose

 class Number:
--- 1,5 ----
 # Tests for rich comparisons

! from test.test_support import TestFailed, verify, verbose

 class Number:
Index: test_robotparser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_robotparser.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_robotparser.py	16 Apr 2002 01:38:40 -0000	1.2
--- test_robotparser.py	23 Jul 2002 19:04:00 -0000	1.3
***************
*** 1,3 ****
! import unittest, StringIO, robotparser, test_support

 class RobotTestCase(unittest.TestCase):
--- 1,4 ----
! import unittest, StringIO, robotparser
! from test import test_support

 class RobotTestCase(unittest.TestCase):
Index: test_sax.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sax.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** test_sax.py	24 Oct 2001 20:32:02 -0000	1.19
--- test_sax.py	23 Jul 2002 19:04:00 -0000	1.20
***************
*** 13,17 ****
 from xml.sax.xmlreader import InputSource, AttributesImpl, AttributesNSImpl
 from cStringIO import StringIO
! from test_support import verify, verbose, TestFailed, findfile
 import os

--- 13,17 ----
 from xml.sax.xmlreader import InputSource, AttributesImpl, AttributesNSImpl
 from cStringIO import StringIO
! from test.test_support import verify, verbose, TestFailed, findfile
 import os

Index: test_scope.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_scope.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** test_scope.py	20 Apr 2002 04:51:36 -0000	1.26
--- test_scope.py	23 Jul 2002 19:04:00 -0000	1.27
***************
*** 1,3 ****
! from test_support import verify, TestFailed, check_syntax

 import warnings
--- 1,3 ----
! from test.test_support import verify, TestFailed, check_syntax

 import warnings
Index: test_select.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_select.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** test_select.py	13 Jun 2002 22:23:47 -0000	1.14
--- test_select.py	23 Jul 2002 19:04:00 -0000	1.15
***************
*** 1,4 ****
 # Testing select module
! from test_support import verbose
 import select
 import os
--- 1,4 ----
 # Testing select module
! from test.test_support import verbose
 import select
 import os
Index: test_sgmllib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sgmllib.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_sgmllib.py	24 Sep 2001 20:22:09 -0000	1.2
--- test_sgmllib.py	23 Jul 2002 19:04:01 -0000	1.3
***************
*** 1,6 ****
 import pprint
 import sgmllib
- import test_support
 import unittest

--- 1,6 ----
 import pprint
 import sgmllib
 import unittest
+ from test import test_support

Index: test_sha.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sha.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_sha.py	20 Sep 2001 21:33:42 -0000	1.3
--- test_sha.py	23 Jul 2002 19:04:01 -0000	1.4
***************
*** 6,11 ****

 import sha
- import test_support
 import unittest

--- 6,11 ----

 import sha
 import unittest
+ from test import test_support

Index: test_signal.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_signal.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_signal.py	16 Jul 2002 21:35:23 -0000	1.11
--- test_signal.py	23 Jul 2002 19:04:01 -0000	1.12
***************
*** 1,4 ****
 # Test the signal module
! from test_support import verbose, TestSkipped, TestFailed
 import signal
 import os, sys, time
--- 1,4 ----
 # Test the signal module
! from test.test_support import verbose, TestSkipped, TestFailed
 import signal
 import os, sys, time
Index: test_slice.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_slice.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_slice.py	19 Jul 2002 15:47:06 -0000	1.1
--- test_slice.py	23 Jul 2002 19:04:02 -0000	1.2
***************
*** 1,5 ****
 # tests for slice objects; in particular the indices method.

! from test_support import vereq

 vereq(slice(None ).indices(10), (0, 10, 1))
--- 1,5 ----
 # tests for slice objects; in particular the indices method.

! from test.test_support import vereq

 vereq(slice(None ).indices(10), (0, 10, 1))
Index: test_socket.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_socket.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** test_socket.py	19 Jul 2002 19:23:54 -0000	1.42
--- test_socket.py	23 Jul 2002 19:04:02 -0000	1.43
***************
*** 2,6 ****

 import unittest
! import test_support

 import socket
--- 2,6 ----

 import unittest
! from test import test_support

 import socket
Index: test_socket_ssl.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_socket_ssl.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_socket_ssl.py	18 Oct 2001 21:57:37 -0000	1.4
--- test_socket_ssl.py	23 Jul 2002 19:04:02 -0000	1.5
***************
*** 1,5 ****
 # Test just the SSL support in the socket module, in a moderately bogus way.

! import test_support

 # Optionally test SSL support. This currently requires the 'network' resource
--- 1,5 ----
 # Test just the SSL support in the socket module, in a moderately bogus way.

! from test import test_support

 # Optionally test SSL support. This currently requires the 'network' resource
Index: test_socketserver.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_socketserver.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_socketserver.py	29 Oct 2001 07:18:02 -0000	1.6
--- test_socketserver.py	23 Jul 2002 19:04:03 -0000	1.7
***************
*** 1,6 ****
 # Test suite for SocketServer.py

! import test_support
! from test_support import verbose, verify, TESTFN, TestSkipped
 test_support.requires('network')

--- 1,6 ----
 # Test suite for SocketServer.py

! from test import test_support
! from test.test_support import verbose, verify, TESTFN, TestSkipped
 test_support.requires('network')

Index: test_softspace.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_softspace.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_softspace.py	24 Mar 2002 19:25:00 -0000	1.1
--- test_softspace.py	23 Jul 2002 19:04:03 -0000	1.2
***************
*** 1,3 ****
! import test_support
 import StringIO

--- 1,3 ----
! from test import test_support
 import StringIO

Index: test_sre.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sre.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** test_sre.py	9 Dec 2001 16:13:15 -0000	1.35
--- test_sre.py	23 Jul 2002 19:04:03 -0000	1.36
***************
*** 7,11 ****
 sys.path=['.']+sys.path

! from test_support import verbose, TestFailed, have_unicode
 import sre
 import sys, os, string, traceback
--- 7,11 ----
 sys.path=['.']+sys.path

! from test.test_support import verbose, TestFailed, have_unicode
 import sre
 import sys, os, string, traceback
Index: test_strftime.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_strftime.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** test_strftime.py	4 Sep 2001 19:14:14 -0000	1.26
--- test_strftime.py	23 Jul 2002 19:04:03 -0000	1.27
***************
*** 4,8 ****

 import time, calendar, sys, os, re
! from test_support import verbose

 def main():
--- 4,8 ----

 import time, calendar, sys, os, re
! from test.test_support import verbose

 def main():
Index: test_string.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_string.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** test_string.py	23 May 2002 15:15:30 -0000	1.17
--- test_string.py	23 Jul 2002 19:04:04 -0000	1.18
***************
*** 1,4 ****
! from test_support import verbose, TestSkipped
! import string_tests
 import string, sys

--- 1,4 ----
! from test.test_support import verbose, TestSkipped
! from test import string_tests
 import string, sys

Index: test_strop.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_strop.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** test_strop.py	16 Apr 2002 01:27:44 -0000	1.16
--- test_strop.py	23 Jul 2002 19:04:04 -0000	1.17
***************
*** 4,9 ****
 r'test_strop|unittest')
 import strop
- import test_support
 import unittest

--- 4,9 ----
 r'test_strop|unittest')
 import strop
 import unittest
+ from test import test_support

Index: test_struct.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_struct.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** test_struct.py	15 Sep 2001 02:35:15 -0000	1.14
--- test_struct.py	23 Jul 2002 19:04:04 -0000	1.15
***************
*** 1,3 ****
! from test_support import TestFailed, verbose, verify
 import struct
 ## import pdb
--- 1,3 ----
! from test.test_support import TestFailed, verbose, verify
 import struct
 ## import pdb
Index: test_structseq.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_structseq.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_structseq.py	6 Mar 2002 17:18:15 -0000	1.3
--- test_structseq.py	23 Jul 2002 19:04:04 -0000	1.4
***************
*** 1,3 ****
! from test_support import vereq

 import time
--- 1,3 ----
! from test.test_support import vereq

 import time
Index: test_sunaudiodev.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sunaudiodev.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** test_sunaudiodev.py	14 Apr 2001 03:10:12 -0000	1.10
--- test_sunaudiodev.py	23 Jul 2002 19:04:05 -0000	1.11
***************
*** 1,3 ****
! from test_support import verbose, findfile, TestFailed, TestSkipped
 import sunaudiodev
 import os
--- 1,3 ----
! from test.test_support import verbose, findfile, TestFailed, TestSkipped
 import sunaudiodev
 import os
Index: test_sundry.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sundry.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** test_sundry.py	16 Apr 2002 01:27:44 -0000	1.10
--- test_sundry.py	23 Jul 2002 19:04:05 -0000	1.11
***************
*** 9,13 ****
 DeprecationWarning, 'pre$')

! from test_support import verbose

 import BaseHTTPServer
--- 9,13 ----
 DeprecationWarning, 'pre$')

! from test.test_support import verbose

 import BaseHTTPServer
Index: test_symtable.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_symtable.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_symtable.py	15 Feb 2001 23:56:39 -0000	1.3
--- test_symtable.py	23 Jul 2002 19:04:05 -0000	1.4
***************
*** 1,3 ****
! from test_support import verify

 import _symtable
--- 1,3 ----
! from test.test_support import verify

 import _symtable
Index: test_syntax.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_syntax.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_syntax.py	31 May 2002 14:08:29 -0000	1.1
--- test_syntax.py	23 Jul 2002 19:04:06 -0000	1.2
***************
*** 2,6 ****
 import unittest

! import test_support

 class SyntaxTestCase(unittest.TestCase):
--- 2,6 ----
 import unittest

! from test import test_support

 class SyntaxTestCase(unittest.TestCase):
Index: test_thread.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_thread.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** test_thread.py	16 Feb 2002 07:26:27 -0000	1.10
--- test_thread.py	23 Jul 2002 19:04:06 -0000	1.11
***************
*** 3,7 ****
 # Create a bunch of threads, let each do some work, wait until all are done

! from test_support import verbose
 import random
 import thread
--- 3,7 ----
 # Create a bunch of threads, let each do some work, wait until all are done

! from test.test_support import verbose
 import random
 import thread
Index: test_threaded_import.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_threaded_import.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_threaded_import.py	16 Feb 2002 07:26:27 -0000	1.5
--- test_threaded_import.py	23 Jul 2002 19:04:06 -0000	1.6
***************
*** 7,11 ****

 import thread
! from test_support import verbose, TestSkipped

 critical_section = thread.allocate_lock()
--- 7,11 ----

 import thread
! from test.test_support import verbose, TestSkipped

 critical_section = thread.allocate_lock()
Index: test_threadedtempfile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_threadedtempfile.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_threadedtempfile.py	14 Apr 2001 14:35:43 -0000	1.3
--- test_threadedtempfile.py	23 Jul 2002 19:04:06 -0000	1.4
***************
*** 23,27 ****
 import thread # If this fails, we can't test this module
 import threading
! from test_support import TestFailed
 import StringIO
 from traceback import print_exc
--- 23,27 ----
 import thread # If this fails, we can't test this module
 import threading
! from test.test_support import TestFailed
 import StringIO
 from traceback import print_exc
Index: test_threading.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_threading.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_threading.py	20 Aug 2001 21:45:19 -0000	1.2
--- test_threading.py	23 Jul 2002 19:04:06 -0000	1.3
***************
*** 3,7 ****
 # Create a bunch of threads, let each do some work, wait until all are done

! from test_support import verbose
 import random
 import threading
--- 3,7 ----
 # Create a bunch of threads, let each do some work, wait until all are done

! from test.test_support import verbose
 import random
 import threading
Index: test_time.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_time.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** test_time.py	19 Jul 2002 17:04:46 -0000	1.10
--- test_time.py	23 Jul 2002 19:04:06 -0000	1.11
***************
*** 1,3 ****
! import test_support
 import time
 import unittest
--- 1,3 ----
! from test import test_support
 import time
 import unittest
Index: test_timeout.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_timeout.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_timeout.py	13 Jun 2002 20:24:17 -0000	1.6
--- test_timeout.py	23 Jul 2002 19:04:06 -0000	1.7
***************
*** 2,6 ****

 import unittest
! import test_support

 import time
--- 2,6 ----

 import unittest
! from test import test_support

 import time
Index: test_timing.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_timing.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_timing.py	17 Jan 2001 21:51:36 -0000	1.3
--- test_timing.py	23 Jul 2002 19:04:07 -0000	1.4
***************
*** 1,3 ****
! from test_support import verbose
 import timing

--- 1,3 ----
! from test.test_support import verbose
 import timing

Index: test_tokenize.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_tokenize.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_tokenize.py	24 Oct 2001 20:32:03 -0000	1.6
--- test_tokenize.py	23 Jul 2002 19:04:08 -0000	1.7
***************
*** 1,3 ****
! from test_support import verbose, findfile
 import tokenize, os, sys

--- 1,3 ----
! from test.test_support import verbose, findfile
 import tokenize, os, sys

Index: test_traceback.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_traceback.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_traceback.py	20 Sep 2001 21:33:42 -0000	1.4
--- test_traceback.py	23 Jul 2002 19:04:08 -0000	1.5
***************
*** 2,6 ****

 import unittest
! from test_support import run_unittest

 import traceback
--- 2,6 ----

 import unittest
! from test.test_support import run_unittest

 import traceback
Index: test_types.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_types.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** test_types.py	16 Jul 2002 21:35:23 -0000	1.35
--- test_types.py	23 Jul 2002 19:04:08 -0000	1.36
***************
*** 1,5 ****
 # Python test set -- part 6, built-in types

! from test_support import *

 print '6. Built-in types'
--- 1,5 ----
 # Python test set -- part 6, built-in types

! from test.test_support import *

 print '6. Built-in types'
Index: test_ucn.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_ucn.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_ucn.py	24 Jan 2001 07:59:11 -0000	1.8
--- test_ucn.py	23 Jul 2002 19:04:08 -0000	1.9
***************
*** 7,11 ****

 """#"
! from test_support import verify, verbose

 print 'Testing General Unicode Character Name, and case insensitivity...',
--- 7,11 ----

 """#"
! from test.test_support import verify, verbose

 print 'Testing General Unicode Character Name, and case insensitivity...',
Index: test_unary.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_unary.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_unary.py	20 May 2002 14:24:53 -0000	1.5
--- test_unary.py	23 Jul 2002 19:04:08 -0000	1.6
***************
*** 2,6 ****

 import unittest
! from test_support import run_unittest, have_unicode

 class UnaryOpTestCase(unittest.TestCase):
--- 2,6 ----

 import unittest
! from test.test_support import run_unittest, have_unicode

 class UnaryOpTestCase(unittest.TestCase):
Index: test_unicode.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_unicode.py,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** test_unicode.py	23 May 2002 15:15:30 -0000	1.58
--- test_unicode.py	23 Jul 2002 19:04:08 -0000	1.59
***************
*** 6,10 ****

 """#"
! from test_support import verify, verbose, TestFailed
 import sys, string

--- 6,10 ----

 """#"
! from test.test_support import verify, verbose, TestFailed
 import sys, string

Index: test_unicode_file.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_unicode_file.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_unicode_file.py	15 Jan 2002 21:25:51 -0000	1.4
--- test_unicode_file.py	23 Jul 2002 19:04:08 -0000	1.5
***************
*** 4,10 ****
 import os, glob

! from test_support import verify, TestSkipped, TESTFN_UNICODE
 try:
! from test_support import TESTFN_ENCODING
 oldlocale = None
 except ImportError:
--- 4,10 ----
 import os, glob

! from test.test_support import verify, TestSkipped, TESTFN_UNICODE
 try:
! from test.test_support import TESTFN_ENCODING
 oldlocale = None
 except ImportError:
Index: test_unicodedata.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_unicodedata.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_unicodedata.py	17 Jan 2001 19:11:13 -0000	1.5
--- test_unicodedata.py	23 Jul 2002 19:04:08 -0000	1.6
***************
*** 6,10 ****

 """#"
! from test_support import verify, verbose
 import sha

--- 6,10 ----

 """#"
! from test.test_support import verify, verbose
 import sha

Index: test_univnewlines.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_univnewlines.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_univnewlines.py	21 Apr 2002 06:12:02 -0000	1.3
--- test_univnewlines.py	23 Jul 2002 19:04:08 -0000	1.4
***************
*** 1,7 ****
 # Tests universal newline support for both reading and parsing files.
 import unittest
- import test_support
 import os
 import sys

 if not hasattr(sys.stdin, 'newlines'):
--- 1,7 ----
 # Tests universal newline support for both reading and parsing files.
 import unittest
 import os
 import sys
+ from test import test_support

 if not hasattr(sys.stdin, 'newlines'):
Index: test_unpack.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_unpack.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_unpack.py	12 Dec 2000 23:11:42 -0000	1.5
--- test_unpack.py	23 Jul 2002 19:04:08 -0000	1.6
***************
*** 1,3 ****
! from test_support import *

 t = (1, 2, 3)
--- 1,3 ----
! from test.test_support import *

 t = (1, 2, 3)
Index: test_urllib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_urllib.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_urllib.py	28 Jan 2001 21:12:22 -0000	1.8
--- test_urllib.py	23 Jul 2002 19:04:09 -0000	1.9
***************
*** 1,4 ****
 # Minimal test of the quote function
! from test_support import verify, verbose
 import urllib

--- 1,4 ----
 # Minimal test of the quote function
! from test.test_support import verify, verbose
 import urllib

Index: test_urllib2.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_urllib2.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_urllib2.py	24 Oct 2001 20:32:03 -0000	1.6
--- test_urllib2.py	23 Jul 2002 19:04:09 -0000	1.7
***************
*** 1,3 ****
! from test_support import verify
 import urllib2
 import os
--- 1,3 ----
! from test.test_support import verify
 import urllib2
 import os
Index: test_urlparse.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_urlparse.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_urlparse.py	16 Apr 2002 01:38:40 -0000	1.5
--- test_urlparse.py	23 Jul 2002 19:04:09 -0000	1.6
***************
*** 1,5 ****
 #! /usr/bin/env python

! import test_support
 import unittest
 import urlparse
--- 1,5 ----
 #! /usr/bin/env python

! from test import test_support
 import unittest
 import urlparse
Index: test_userdict.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_userdict.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_userdict.py	5 Nov 2001 17:41:48 -0000	1.5
--- test_userdict.py	23 Jul 2002 19:04:09 -0000	1.6
***************
*** 1,5 ****
 # Check every path through every method of UserDict

! from test_support import verify, verbose
 from UserDict import UserDict, IterableUserDict

--- 1,5 ----
 # Check every path through every method of UserDict

! from test.test_support import verify, verbose
 from UserDict import UserDict, IterableUserDict

Index: test_userlist.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_userlist.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_userlist.py	17 Jan 2001 21:51:36 -0000	1.5
--- test_userlist.py	23 Jul 2002 19:04:09 -0000	1.6
***************
*** 2,6 ****

 from UserList import UserList
! from test_support import TestFailed

 # Use check instead of assert so -O doesn't render the
--- 2,6 ----

 from UserList import UserList
! from test.test_support import TestFailed

 # Use check instead of assert so -O doesn't render the
Index: test_userstring.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_userstring.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_userstring.py	12 Apr 2002 16:25:39 -0000	1.6
--- test_userstring.py	23 Jul 2002 19:04:09 -0000	1.7
***************
*** 1,6 ****
 #!/usr/bin/env python
 import sys
! from test_support import verbose
! import string_tests
 # UserString is a wrapper around the native builtin string type.
 # UserString instances should behave similar to builtin string objects.
--- 1,6 ----
 #!/usr/bin/env python
 import sys
! from test.test_support import verbose
! from test import string_tests
 # UserString is a wrapper around the native builtin string type.
 # UserString instances should behave similar to builtin string objects.
Index: test_uu.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_uu.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_uu.py	17 Aug 2001 20:00:11 -0000	1.3
--- test_uu.py	23 Jul 2002 19:04:09 -0000	1.4
***************
*** 4,8 ****
 """

! from test_support import verify, TestFailed, verbose, TESTFN
 import sys, os
 import uu
--- 4,8 ----
 """

! from test.test_support import verify, TestFailed, verbose, TESTFN
 import sys, os
 import uu
Index: test_wave.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_wave.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_wave.py	19 Dec 2000 06:32:57 -0000	1.2
--- test_wave.py	23 Jul 2002 19:04:09 -0000	1.3
***************
*** 1,3 ****
! from test_support import TestFailed
 import os, tempfile
 import wave
--- 1,3 ----
! from test.test_support import TestFailed
 import os, tempfile
 import wave
Index: test_weakref.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_weakref.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** test_weakref.py	10 Jun 2002 20:00:14 -0000	1.19
--- test_weakref.py	23 Jul 2002 19:04:09 -0000	1.20
***************
*** 4,8 ****
 import weakref

! import test_support

--- 4,8 ----
 import weakref

! from test import test_support

Index: test_winreg.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_winreg.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** test_winreg.py	17 Aug 2001 18:39:24 -0000	1.10
--- test_winreg.py	23 Jul 2002 19:04:09 -0000	1.11
***************
*** 5,9 ****
 import os, sys

! from test_support import verify, have_unicode

 test_key_name = "SOFTWARE\\Python Registry Test Key - Delete Me"
--- 5,9 ----
 import os, sys

! from test.test_support import verify, have_unicode

 test_key_name = "SOFTWARE\\Python Registry Test Key - Delete Me"
Index: test_xmllib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_xmllib.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** test_xmllib.py	16 Apr 2002 01:27:44 -0000	1.10
--- test_xmllib.py	23 Jul 2002 19:04:09 -0000	1.11
***************
*** 18,22 ****
 DeprecationWarning, r'xmllib$')

! import test_support
 import unittest
 import xmllib
--- 18,22 ----
 DeprecationWarning, r'xmllib$')

! from test import test_support
 import unittest
 import xmllib
Index: test_xmlrpc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_xmlrpc.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_xmlrpc.py	19 Oct 2001 16:06:52 -0000	1.2
--- test_xmlrpc.py	23 Jul 2002 19:04:09 -0000	1.3
***************
*** 1,6 ****
 import sys
- import test_support
 import unittest
 import xmlrpclib

 alist = [{'astring': 'foo@bar.baz.spam',
--- 1,6 ----
 import sys
 import unittest
 import xmlrpclib
+ from test import test_support

 alist = [{'astring': 'foo@bar.baz.spam',
Index: test_xreadline.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_xreadline.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_xreadline.py	18 Jan 2001 02:22:22 -0000	1.3
--- test_xreadline.py	23 Jul 2002 19:04:09 -0000	1.4
***************
*** 1,3 ****
! from test_support import verbose

 class XReader:
--- 1,3 ----
! from test.test_support import verbose

 class XReader:
Index: test_zipfile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_zipfile.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_zipfile.py	24 Oct 2001 20:32:03 -0000	1.8
--- test_zipfile.py	23 Jul 2002 19:04:09 -0000	1.9
***************
*** 1,5 ****
 import zlib # implied prerequisite
 import zipfile, os, StringIO, tempfile
! from test_support import TestFailed

 srcname = "junk9630"+os.extsep+"tmp"
--- 1,5 ----
 import zlib # implied prerequisite
 import zipfile, os, StringIO, tempfile
! from test.test_support import TestFailed

 srcname = "junk9630"+os.extsep+"tmp"
Index: test_zlib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_zlib.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** test_zlib.py	19 Apr 2002 14:36:57 -0000	1.17
--- test_zlib.py	23 Jul 2002 19:04:09 -0000	1.18
***************
*** 1,6 ****
 import zlib
- from test_support import TestFailed
 import sys
 import imp

 try:
--- 1,6 ----
 import zlib
 import sys
 import imp
+ from test.test_support import TestFailed

 try: