Tue, 30 Jul 2002 16:26:03 -0700

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv6095/Lib/test

Modified Files:
	double_const.py pickletester.py regrtest.py string_tests.py 
	test___all__.py test_al.py test_atexit.py test_b1.py 
	test_b2.py test_binascii.py test_bisect.py test_bufio.py 
	test_builtin.py test_cd.py test_cfgparser.py test_cgi.py 
	test_cl.py test_class.py test_coercion.py test_compare.py 
	test_complex.py test_contains.py test_exceptions.py 
	test_extcall.py test_file.py test_frozen.py test_funcattrs.py 
	test_getargs.py test_gl.py test_global.py test_grammar.py 
	test_gzip.py test_httplib.py test_strop.py test_support.py 
Log Message:
Complete the absolute import patch for the test suite.  All relative
imports of test modules now import from the test package.  Other
related oddities are also fixed (like DeprecationWarning filters that
weren't specifying the full import part, etc.).  Also did a general
code cleanup to remove all "from test.test_support import *"'s.  Other
from...import *'s weren't changed.

Index: double_const.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/double_const.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** double_const.py	8 May 2001 03:58:01 -0000	1.1
--- double_const.py	30 Jul 2002 23:26:00 -0000	1.2
***************
*** 1,3 ****
! from test_support import TestFailed

  # A test for SF bug 422177:  manifest float constants varied way too much in
--- 1,3 ----
! from test.test_support import TestFailed

  # A test for SF bug 422177:  manifest float constants varied way too much in

Index: pickletester.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/pickletester.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** pickletester.py	16 Apr 2002 01:38:39 -0000	1.15
--- pickletester.py	30 Jul 2002 23:26:00 -0000	1.16
***************
*** 1,4 ****
  import unittest
! from test_support import TestFailed, have_unicode

  class C:
--- 1,4 ----
  import unittest
! from test.test_support import TestFailed, have_unicode

  class C:

Index: regrtest.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/regrtest.py,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** regrtest.py	23 Jul 2002 19:03:43 -0000	1.91
--- regrtest.py	30 Jul 2002 23:26:00 -0000	1.92
***************
*** 245,250 ****
          print count(len(good), "test"), "OK."
          if verbose:
!             print "CAUTION:  stdout isn't compared in verbose mode:  a test"
!             print "that passes in verbose mode may fail without it."
      if bad:
          print count(len(bad), "test"), "failed:"
--- 245,250 ----
          print count(len(good), "test"), "OK."
          if verbose:
!             print "CAUTION:  stdout isn't compared in verbose mode:"
!             print "a test that passes in verbose mode may fail without it."
      if bad:
          print count(len(bad), "test"), "failed:"
***************
*** 339,343 ****
                  sys.stdout = cfp
                  print test              # Output file starts with test name
!             the_module = __import__(test, globals(), locals(), [])
              # Most tests run to completion simply as a side-effect of
              # being imported.  For the benefit of tests that can't run
--- 339,349 ----
                  sys.stdout = cfp
                  print test              # Output file starts with test name
!             if test.startswith('test.'):
!                 abstest = test
!             else:
!                 # Always import it from the test package
!                 abstest = 'test.' + test
!             the_package = __import__(abstest, globals(), locals(), [])
!             the_module = getattr(the_package, test)
              # Most tests run to completion simply as a side-effect of
              # being imported.  For the benefit of tests that can't run
***************
*** 785,787 ****
--- 791,807 ----

  if __name__ == '__main__':
+     # Remove regrtest.py's own directory from the module search path.  This
+     # prevents relative imports from working, and relative imports will screw
+     # up the testing framework.  E.g. if both test.test_support and
+     # test_support are imported, they will not contain the same globals, and
+     # much of the testing framework relies on the globals in the
+     # test.test_support module.
+     mydir = os.path.abspath(os.path.normpath(os.path.dirname(sys.argv[0])))
+     i = pathlen = len(sys.path)
+     while i >= 0:
+         i -= 1
+         if os.path.abspath(os.path.normpath(sys.path[i])) == mydir:
+             del sys.path[i]
+     if len(sys.path) == pathlen:
+         print 'Could not find %r in sys.path to remove it' % mydir
      main()

Index: string_tests.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/string_tests.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** string_tests.py	14 Jun 2002 00:50:42 -0000	1.18
--- string_tests.py	30 Jul 2002 23:26:00 -0000	1.19
***************
*** 2,6 ****

  import string
! from test_support import verify, verbose, TestFailed, have_unicode

  transtable = '\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037 !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`xyzdefghijklmnopqrstuvwxyz{|}~\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377'
--- 2,6 ----

  import string
! from test.test_support import verify, verbose, TestFailed, have_unicode

  transtable = '\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037 !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`xyzdefghijklmnopqrstuvwxyz{|}~\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377'

Index: test___all__.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test___all__.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** test___all__.py	16 Apr 2002 01:27:44 -0000	1.26
--- test___all__.py	30 Jul 2002 23:26:00 -0000	1.27
***************
*** 1,3 ****
! from test_support import verify, verbose
  import sys
  import warnings
--- 1,3 ----
! from test.test_support import verify, verbose
  import sys
  import warnings

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

  alattrs = ['__doc__', '__name__', 'getdefault', 'getminmax', 'getname', 'getparams',
--- 4,8 ----
  """
  import al
! from test.test_support import verbose

  alattrs = ['__doc__', '__name__', 'getdefault', 'getminmax', 'getname', 'getparams',

Index: test_atexit.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_atexit.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test_atexit.py	26 Jul 2002 11:33:49 -0000	1.7
--- test_atexit.py	30 Jul 2002 23:26:01 -0000	1.8
***************
*** 1,4 ****
  # Test the atexit module.
! from test_support import TESTFN, vereq
  import atexit
  from os import popen, unlink
--- 1,4 ----
  # Test the atexit module.
! from test.test_support import TESTFN, vereq
  import atexit
  from os import popen, unlink

Index: test_b1.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_b1.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** test_b1.py	16 Jul 2002 21:35:23 -0000	1.48
--- test_b1.py	30 Jul 2002 23:26:01 -0000	1.49
***************
*** 1,5 ****
  # Python test set -- part 4a, built-in functions a-m

! from test_support import *

  print '__import__'
--- 1,5 ----
  # Python test set -- part 4a, built-in functions a-m

! from test.test_support import TestFailed, fcmp, have_unicode, TESTFN, unlink

  print '__import__'

Index: test_b2.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_b2.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** test_b2.py	5 Jun 2002 23:12:44 -0000	1.35
--- test_b2.py	30 Jul 2002 23:26:01 -0000	1.36
***************
*** 1,5 ****
  # Python test set -- part 4b, built-in functions n-z

! from test_support import *

  print 'oct'
--- 1,5 ----
  # Python test set -- part 4b, built-in functions n-z

! from test.test_support import TestFailed, fcmp, TESTFN, unlink, vereq

  print 'oct'

Index: test_binascii.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_binascii.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** test_binascii.py	23 May 2002 15:15:30 -0000	1.14
--- test_binascii.py	30 Jul 2002 23:26:01 -0000	1.15
***************
*** 1,5 ****
  """Test the binascii C module."""

! from test_support import verify, verbose, have_unicode
  import binascii

--- 1,5 ----
  """Test the binascii C module."""

! from test.test_support import verify, verbose, have_unicode
  import binascii

Index: test_bisect.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_bisect.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_bisect.py	29 Dec 2000 02:06:45 -0000	1.1
--- test_bisect.py	30 Jul 2002 23:26:01 -0000	1.2
***************
*** 1,3 ****
! from test_support import TestFailed

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

  import bisect

Index: test_bufio.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_bufio.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_bufio.py	17 Jan 2001 21:51:35 -0000	1.5
--- test_bufio.py	30 Jul 2002 23:26:01 -0000	1.6
***************
*** 1,3 ****
! from test_support import verify, TestFailed, TESTFN

  # Simple test to ensure that optimizations in fileobject.c deliver
--- 1,3 ----
! from test.test_support import verify, TestFailed, TESTFN

  # Simple test to ensure that optimizations in fileobject.c deliver

Index: test_builtin.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_builtin.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_builtin.py	27 Jan 1992 16:56:44 -0000	1.1
--- test_builtin.py	30 Jul 2002 23:26:01 -0000	1.2
***************
*** 1,5 ****
  # Python test set -- part 4, built-in functions

! from test_support import *

  print '4. Built-in functions'
--- 1,5 ----
  # Python test set -- part 4, built-in functions

! from test.test_support import unload

  print '4. Built-in functions'
***************
*** 7,13 ****
  print 'test_b1'
  unload('test_b1')
! import test_b1

  print 'test_b2'
  unload('test_b2')
! import test_b2
--- 7,13 ----
  print 'test_b1'
  unload('test_b1')
! from test import test_b1

  print 'test_b2'
  unload('test_b2')
! from test import test_b2

Index: test_cd.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_cd.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_cd.py	17 Jan 2001 21:51:35 -0000	1.5
--- test_cd.py	30 Jul 2002 23:26:01 -0000	1.6
***************
*** 4,8 ****
  """
  import cd
! from test_support import verbose

  cdattrs = ['BLOCKSIZE', 'CDROM', 'DATASIZE', 'ERROR', 'NODISC', 'PAUSED', 'PLAYING', 'READY',
--- 4,8 ----
  """
  import cd
! from test.test_support import verbose

  cdattrs = ['BLOCKSIZE', 'CDROM', 'DATASIZE', 'ERROR', 'NODISC', 'PAUSED', 'PLAYING', 'READY',

Index: test_cfgparser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_cfgparser.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_cfgparser.py	16 Apr 2002 01:38:40 -0000	1.11
--- test_cfgparser.py	30 Jul 2002 23:26:01 -0000	1.12
***************
*** 2,6 ****
  import StringIO

! from test_support import TestFailed, verify

--- 2,6 ----
  import StringIO

! from test.test_support import TestFailed, verify

Index: test_cgi.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_cgi.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_cgi.py	17 Jan 2001 19:11:13 -0000	1.6
--- test_cgi.py	30 Jul 2002 23:26:01 -0000	1.7
***************
*** 1,3 ****
! from test_support import verify, verbose
  import cgi
  import os
--- 1,3 ----
! from test.test_support import verify, verbose
  import cgi
  import os

Index: test_cl.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_cl.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_cl.py	17 Jan 2001 21:51:35 -0000	1.5
--- test_cl.py	30 Jul 2002 23:26:01 -0000	1.6
***************
*** 4,8 ****
  """
  import cl
! from test_support import verbose

  clattrs = ['ADDED_ALGORITHM_ERROR', 'ALAW', 'ALGORITHM_ID',
--- 4,8 ----
  """
  import cl
! from test.test_support import verbose

  clattrs = ['ADDED_ALGORITHM_ERROR', 'ALAW', 'ALGORITHM_ID',

Index: test_class.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_class.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_class.py	13 Jun 2002 21:32:51 -0000	1.8
--- test_class.py	30 Jul 2002 23:26:01 -0000	1.9
***************
*** 1,5 ****
  "Test the functionality of Python classes implementing operators."

! from test_support import TestFailed

  testmeths = [
--- 1,5 ----
  "Test the functionality of Python classes implementing operators."

! from test.test_support import TestFailed

  testmeths = [

Index: test_coercion.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_coercion.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_coercion.py	16 Apr 2002 01:27:44 -0000	1.5
--- test_coercion.py	30 Jul 2002 23:26:01 -0000	1.6
***************
*** 114,118 ****
                          r'complex divmod\(\), // and % are deprecated',
                          DeprecationWarning,
!                         r'test_coercion$')
  do_infix_binops()
  do_prefix_binops()
--- 114,118 ----
                          r'complex divmod\(\), // and % are deprecated',
                          DeprecationWarning,
!                         r'test.test_coercion$')
  do_infix_binops()
  do_prefix_binops()

Index: test_compare.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_compare.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_compare.py	4 Sep 2001 19:14:14 -0000	1.6
--- test_compare.py	30 Jul 2002 23:26:01 -0000	1.7
***************
*** 1,6 ****
  import sys

- from test_support import *
- 
  class Empty:
      def __repr__(self):
--- 1,4 ----

Index: test_complex.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_complex.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_complex.py	29 Dec 2001 17:34:57 -0000	1.8
--- test_complex.py	30 Jul 2002 23:26:01 -0000	1.9
***************
*** 1,3 ****
! from test_support import TestFailed, vereq
  from random import random

--- 1,3 ----
! from test.test_support import TestFailed, vereq
  from random import random

Index: test_contains.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_contains.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_contains.py	17 Aug 2001 18:39:24 -0000	1.8
--- test_contains.py	30 Jul 2002 23:26:01 -0000	1.9
***************
*** 1,3 ****
! from test_support import TestFailed, have_unicode

  class base_set:
--- 1,3 ----
! from test.test_support import TestFailed, have_unicode

  class base_set:

Index: test_exceptions.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_exceptions.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** test_exceptions.py	16 Apr 2002 01:27:44 -0000	1.17
--- test_exceptions.py	30 Jul 2002 23:26:01 -0000	1.18
***************
*** 1,5 ****
  # Python test set -- part 5, built-in exceptions

! from test_support import *
  from types import ClassType
  import warnings
--- 1,5 ----
  # Python test set -- part 5, built-in exceptions

! from test.test_support import TestFailed, TESTFN, unlink
  from types import ClassType
  import warnings

Index: test_extcall.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_extcall.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** test_extcall.py	24 Aug 2001 19:11:57 -0000	1.17
--- test_extcall.py	30 Jul 2002 23:26:01 -0000	1.18
***************
*** 1,3 ****
! from test_support import verify, verbose, TestFailed, sortdict
  from UserList import UserList

--- 1,3 ----
! from test.test_support import verify, verbose, TestFailed, sortdict
  from UserList import UserList

Index: test_file.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_file.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** test_file.py	11 Jun 2002 06:22:30 -0000	1.9
--- test_file.py	30 Jul 2002 23:26:01 -0000	1.10
***************
*** 3,7 ****
  from array import array

! from test_support import verify, TESTFN, TestFailed
  from UserList import UserList

--- 3,7 ----
  from array import array

! from test.test_support import verify, TESTFN, TestFailed
  from UserList import UserList

Index: test_frozen.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_frozen.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_frozen.py	18 Oct 2001 18:49:37 -0000	1.1
--- test_frozen.py	30 Jul 2002 23:26:01 -0000	1.2
***************
*** 1,5 ****
  # Test the frozen module defined in frozen.c.

! from test_support import TestFailed
  import sys, os

--- 1,5 ----
  # Test the frozen module defined in frozen.c.

! from test.test_support import TestFailed
  import sys, os

Index: test_funcattrs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_funcattrs.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_funcattrs.py	22 Oct 2001 02:00:09 -0000	1.11
--- test_funcattrs.py	30 Jul 2002 23:26:01 -0000	1.12
***************
*** 1,3 ****
! from test_support import verbose, TestFailed, verify
  import types

--- 1,3 ----
! from test.test_support import verbose, TestFailed, verify
  import types

Index: test_getargs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_getargs.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_getargs.py	20 May 2002 14:54:17 -0000	1.3
--- test_getargs.py	30 Jul 2002 23:26:01 -0000	1.4
***************
*** 15,19 ****
  # this test will fail because it does not test the right part of the
  # PyArg_ParseTuple() implementation.
! from test_support import have_unicode
  import marshal

--- 15,19 ----
  # this test will fail because it does not test the right part of the
  # PyArg_ParseTuple() implementation.
! from test.test_support import have_unicode
  import marshal

Index: test_gl.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_gl.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test_gl.py	17 Jan 2001 21:51:35 -0000	1.7
--- test_gl.py	30 Jul 2002 23:26:01 -0000	1.8
***************
*** 4,8 ****
      Roger E. Masse
  """
! from test_support import verbose, TestSkipped
  import gl, GL, time

--- 4,8 ----
      Roger E. Masse
  """
! from test.test_support import verbose, TestSkipped
  import gl, GL, time

Index: test_global.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_global.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_global.py	2 Mar 2001 01:48:16 -0000	1.5
--- test_global.py	30 Jul 2002 23:26:01 -0000	1.6
***************
*** 1,5 ****
  """Verify that warnings are issued for global statements following use."""

! from test_support import check_syntax

  import warnings
--- 1,5 ----
  """Verify that warnings are issued for global statements following use."""

! from test.test_support import check_syntax

  import warnings

Index: test_grammar.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_grammar.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** test_grammar.py	9 Dec 2001 09:12:34 -0000	1.40
--- test_grammar.py	30 Jul 2002 23:26:01 -0000	1.41
***************
*** 2,6 ****
  # This just tests whether the parser accepts them all.

! from test_support import *
  import sys

--- 2,6 ----
  # This just tests whether the parser accepts them all.

! from test.test_support import TestFailed, verify, check_syntax
  import sys

Index: test_gzip.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_gzip.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** test_gzip.py	23 May 2002 01:43:05 -0000	1.9
--- test_gzip.py	30 Jul 2002 23:26:01 -0000	1.10
***************
*** 1,3 ****
! from test_support import verify
  import sys, os
  import gzip, tempfile
--- 1,3 ----
! from test.test_support import verify
  import sys, os
  import gzip, tempfile

Index: test_httplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_httplib.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_httplib.py	16 Jul 2002 21:35:23 -0000	1.8
--- test_httplib.py	30 Jul 2002 23:26:01 -0000	1.9
***************
*** 1,3 ****
! from test_support import verify,verbose
  import httplib
  import StringIO
--- 1,3 ----
! from test.test_support import verify,verbose
  import httplib
  import StringIO

Index: test_strop.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_strop.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** test_strop.py	23 Jul 2002 19:04:04 -0000	1.17
--- test_strop.py	30 Jul 2002 23:26:01 -0000	1.18
***************
*** 2,6 ****
  warnings.filterwarnings("ignore", "strop functions are obsolete;",
                          DeprecationWarning,
!                         r'test_strop|unittest')
  import strop
  import unittest
--- 2,6 ----
  warnings.filterwarnings("ignore", "strop functions are obsolete;",
                          DeprecationWarning,
!                         r'test.test_strop|unittest')
  import strop
  import unittest

Index: test_support.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_support.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** test_support.py	29 Dec 2001 17:34:57 -0000	1.41
--- test_support.py	30 Jul 2002 23:26:01 -0000	1.42
***************
*** 1,4 ****
--- 1,7 ----
  """Supporting definitions for the Python regression test."""

+ if __name__ != 'test.test_support':
+     raise ImportError, 'test_support must be imported from the test package'
+ 
  import sys