a bold attempt to fix things broken by MAL's verify patch: import

'verify' iff it's used by a test module...

diff --git a/Lib/test/test_al.py b/Lib/test/test_al.py
index 4f86f3999b1126e50ef8441a11f6b38c7196e591..d11c7e51bae30854b650b125ac213691128092ce 100755 (executable)
--- a/Lib/test/test_al.py
+++ b/Lib/test/test_al.py
@@ -3,7 +3,7 @@
    Roger E. Masse
 """
 import al
-from test_support import verify, verbose
+from test_support import verbose
 
 alattrs = ['__doc__', '__name__', 'getdefault', 'getminmax', 'getname', 'getparams',
            'newconfig', 'openport', 'queryparams', 'setparams']

diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py
index a20b870ce790404b0c2c169e9eebb48a1645c33e..087e65b555473c7a73550b0db9394c72fb74d742 100755 (executable)
--- a/Lib/test/test_array.py
+++ b/Lib/test/test_array.py
@@ -3,7 +3,7 @@
    Roger E. Masse
 """
 import array
-from test_support import verify, verbose, TESTFN, unlink, TestFailed
+from test_support import verbose, TESTFN, unlink, TestFailed
 
 def main():
 

diff --git a/Lib/test/test_atexit.py b/Lib/test/test_atexit.py
index f76f110d6030fd2394e15af818508067ef3012f0..517610b235b4e0393957b1023feec8272c53249e 100644 (file)
--- a/Lib/test/test_atexit.py
+++ b/Lib/test/test_atexit.py
@@ -1,5 +1,5 @@
 # Test the exit module
-from test_support import verify, verbose
+from test_support import verbose
 import atexit
 
 def handler1():

diff --git a/Lib/test/test_audioop.py b/Lib/test/test_audioop.py
index f74242df1bf809d8e56de65aa8ccad92c065c148..495a918b699e041e31c4cf4247405a8ceb29e80a 100644 (file)
--- a/Lib/test/test_audioop.py
+++ b/Lib/test/test_audioop.py
@@ -1,6 +1,6 @@
 # Test audioop.
 import audioop
-from test_support import verify, verbose
+from test_support import verbose
 
 def gendata1():
     return '\0\1\2'

diff --git a/Lib/test/test_binhex.py b/Lib/test/test_binhex.py
index 4cee4fbf1e2aa47d69b7868464bd51cdb637fd66..a2b2a2c56be9291fb6c55ae4035f1524bb1138e6 100755 (executable)
--- a/Lib/test/test_binhex.py
+++ b/Lib/test/test_binhex.py
@@ -6,7 +6,7 @@
 """
 import binhex
 import tempfile
-from test_support import verify, verbose, TestSkipped
+from test_support import verbose, TestSkipped
 
 def test():
 

diff --git a/Lib/test/test_bsddb.py b/Lib/test/test_bsddb.py
index e559b20e0a2d1b4ed4fb56ec551967f98550b67e..b59a4e0a1156f94099a7fbadd4716135485c079b 100755 (executable)
--- a/Lib/test/test_bsddb.py
+++ b/Lib/test/test_bsddb.py
@@ -6,7 +6,7 @@
 import os
 import bsddb
 import tempfile
-from test_support import verify, verbose
+from test_support import verbose
 
 def test(openmethod, what):
 

diff --git a/Lib/test/test_bufio.py b/Lib/test/test_bufio.py
index e4467fe58b471030f575335d03a3194c0b359f14..12359c44d02e224a641f85e87e0c002265e814ab 100644 (file)
--- a/Lib/test/test_bufio.py
+++ b/Lib/test/test_bufio.py
@@ -1,4 +1,4 @@
-from test_support import TestFailed, TESTFN, verify
+from test_support import verify, TestFailed, TESTFN
 
 # Simple test to ensure that optimizations in fileobject.c deliver
 # the expected results.  For best testing, run this under a debug-build

diff --git a/Lib/test/test_cd.py b/Lib/test/test_cd.py
index 7af2e0b07b16362b337fd8d70b33a2103c489a04..9a45a7d3a7d2b380e9b3ca94ed3a072a59446887 100755 (executable)
--- a/Lib/test/test_cd.py
+++ b/Lib/test/test_cd.py
@@ -3,7 +3,7 @@
    Roger E. Masse
 """
 import cd
-from test_support import verify, verbose
+from test_support import verbose
 
 cdattrs = ['BLOCKSIZE', 'CDROM', 'DATASIZE', 'ERROR', 'NODISC', 'PAUSED', 'PLAYING', 'READY',
            'STILL', '__doc__', '__name__', 'atime', 'audio', 'catalog', 'control', 'createparser', 'error',

diff --git a/Lib/test/test_cl.py b/Lib/test/test_cl.py
index f8112eb5bcb22737014dc3b896d603cc73c4cc33..26c5146863f1b39b053f1cd3f45df87401a3078d 100755 (executable)
--- a/Lib/test/test_cl.py
+++ b/Lib/test/test_cl.py
@@ -3,7 +3,7 @@
    Roger E. Masse
 """
 import cl
-from test_support import verify, verbose
+from test_support import verbose
 
 clattrs = ['ADDED_ALGORITHM_ERROR', 'ALAW', 'ALGORITHM_ID',
 'ALGORITHM_VERSION', 'AUDIO', 'AWARE_ERROR', 'AWARE_MPEG_AUDIO',

diff --git a/Lib/test/test_cmath.py b/Lib/test/test_cmath.py
index 9caa2164a2ce42e6210c6f14e3450309b4e17649..509c739ea0dd119beca8eedd0363d14f23408b80 100755 (executable)
--- a/Lib/test/test_cmath.py
+++ b/Lib/test/test_cmath.py
@@ -3,7 +3,7 @@
     Roger E. Masse
 """
 import cmath
-from test_support import verify, verbose
+from test_support import verbose
 
 testdict = {'acos' : 1.0,
             'acosh' : 1.0,

diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index fa608b1b90f4d432d65375aeb25eff064d66e02c..8905864a91455eba973d863eac155e5fc6b413fc 100644 (file)
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose, TestFailed
+from test_support import verbose, TestFailed
 
 if verbose:
     print 'Running test on duplicate arguments'

diff --git a/Lib/test/test_cookie.py b/Lib/test/test_cookie.py
index 414de31a0c0bd3847f2969fe3b7d700c6cfb65ff..87d0521b68886fdad60d055e45d3372c77c8334f 100644 (file)
--- a/Lib/test/test_cookie.py
+++ b/Lib/test/test_cookie.py
@@ -2,6 +2,7 @@
 
 from test_support import verify
 import Cookie
+from test_support import verify, verbose
 
 # Currently this only tests SimpleCookie
 

diff --git a/Lib/test/test_dbm.py b/Lib/test/test_dbm.py
index 6510125fe5cd497e5a72efea00c31d3fb01cfcbe..94949cf6fcb93293eb078498ea6b23377eca5f8d 100755 (executable)
--- a/Lib/test/test_dbm.py
+++ b/Lib/test/test_dbm.py
@@ -4,7 +4,7 @@
 """
 import dbm
 from dbm import error
-from test_support import verify, verbose
+from test_support import verbose
 
 filename = '/tmp/delete_me'
 

diff --git a/Lib/test/test_dl.py b/Lib/test/test_dl.py
index c5b3bb4edd88b2df904da6e7951db8e3b00f46cf..60a5cf0cefc754438f0dd5efb2e68836be09da6f 100755 (executable)
--- a/Lib/test/test_dl.py
+++ b/Lib/test/test_dl.py
@@ -4,7 +4,7 @@
 """
 
 import dl
-from test_support import verify, verbose,TestSkipped
+from test_support import verbose,TestSkipped
 
 sharedlibs = [
     ('/usr/lib/libc.so', 'getpid'),

diff --git a/Lib/test/test_errno.py b/Lib/test/test_errno.py
index 2fb6b34eb50caefb29b9d752ec5092b87c192665..cb1e729f8ec0aa36245df0d8c1106c4a581ea507 100755 (executable)
--- a/Lib/test/test_errno.py
+++ b/Lib/test/test_errno.py
@@ -4,7 +4,7 @@
 """
 
 import errno
-from test_support import verify, verbose
+from test_support import verbose
 
 errors = ['E2BIG', 'EACCES', 'EADDRINUSE', 'EADDRNOTAVAIL', 'EADV',
           'EAFNOSUPPORT', 'EAGAIN', 'EALREADY', 'EBADE', 'EBADF',

diff --git a/Lib/test/test_extcall.py b/Lib/test/test_extcall.py
index 5b6c5ec3694adcd585bc88990a2ae3ca2d6431f2..b727cc7be3dcf40ca622af0a3185a9d1fa6ed488 100644 (file)
--- a/Lib/test/test_extcall.py
+++ b/Lib/test/test_extcall.py
@@ -1,6 +1,5 @@
-from test_support import verify, verbose
+from test_support import verify, verbose, TestFailed
 from UserList import UserList
-from test_support import TestFailed
 import string
 
 def f(*a, **k):

diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py
index a598a413e2b868b544094ca8fba9d89c8c838c69..b6d4dfa72f0361bca57ea2a1982990e8b72555e1 100755 (executable)
--- a/Lib/test/test_fcntl.py
+++ b/Lib/test/test_fcntl.py
@@ -6,7 +6,7 @@ import struct
 import fcntl
 import FCNTL
 import os, sys
-from test_support import verify, verbose, TESTFN
+from test_support import verbose, TESTFN
 
 filename = TESTFN
 

diff --git a/Lib/test/test_format.py b/Lib/test/test_format.py
index a85c9f5702b748ba9de22013a03c8ee5fe0f4197..c57917f5503f18e102d811b809542b1b858e47b2 100644 (file)
--- a/Lib/test/test_format.py
+++ b/Lib/test/test_format.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose
+from test_support import verbose
 import string, sys
 
 # test string formatting operator (I am not sure if this is being tested
@@ -184,7 +184,7 @@ def test_exc(formatstr, args, exception, excmsg):
         testformat(formatstr, args)
     except exception, exc:
         if str(exc) == excmsg:
-            if verbose: 
+            if verbose:
                 print "yes"
         else:
             if verbose: print 'no'

diff --git a/Lib/test/test_gdbm.py b/Lib/test/test_gdbm.py
index dfd05b75c45cfd05885b5ef63cd1607bd40f775c..67c67eb6e71b3422c2e0064389fd8000ffcd3f28 100755 (executable)
--- a/Lib/test/test_gdbm.py
+++ b/Lib/test/test_gdbm.py
@@ -5,7 +5,7 @@
 
 import gdbm
 from gdbm import error
-from test_support import verify, verbose, TestFailed
+from test_support import verbose, TestFailed
 
 filename= '/tmp/delete_me'
 

diff --git a/Lib/test/test_gl.py b/Lib/test/test_gl.py
index 72b08953c5b65476b169e9014c6de4b68361c6e0..61eaa835b4a75bdd9a7df897db6601ff1ec86acb 100755 (executable)
--- a/Lib/test/test_gl.py
+++ b/Lib/test/test_gl.py
@@ -3,7 +3,7 @@
     taken mostly from the documentation.
     Roger E. Masse
 """
-from test_support import verify, verbose, TestSkipped
+from test_support import verbose, TestSkipped
 import gl, GL, time
 
 glattrs = ['RGBcolor', 'RGBcursor', 'RGBmode', 'RGBrange', 'RGBwritemask',

diff --git a/Lib/test/test_grp.py b/Lib/test/test_grp.py
index eda39d5bb24062bfa93fbb075a088edc86ee250a..b737da97287a46c96c2c5da9efff45da026ad7f3 100755 (executable)
--- a/Lib/test/test_grp.py
+++ b/Lib/test/test_grp.py
@@ -4,7 +4,7 @@
 """
 
 import grp
-from test_support import verify, verbose
+from test_support import verbose
 
 groups = grp.getgrall()
 if verbose:

diff --git a/Lib/test/test_imageop.py b/Lib/test/test_imageop.py
index 3a63e3cbd7564bb3dd46100bbba85c1c1314ce23..7a6981e38bed475a5efa62a6220560946f317123 100755 (executable)
--- a/Lib/test/test_imageop.py
+++ b/Lib/test/test_imageop.py
@@ -5,7 +5,7 @@
    Roger E. Masse
 """
 
-from test_support import verify, verbose, unlink
+from test_support import verbose, unlink
 
 import imageop, uu
 

diff --git a/Lib/test/test_imgfile.py b/Lib/test/test_imgfile.py
index 5606bb0153a62934a3e4b5ec6b98da996e48118d..8eb330de376a82f80578a6196431509f6ecb1fe8 100755 (executable)
--- a/Lib/test/test_imgfile.py
+++ b/Lib/test/test_imgfile.py
@@ -4,7 +4,7 @@
    Roger E. Masse
 """
 
-from test_support import verify, verbose, unlink, findfile
+from test_support import verbose, unlink, findfile
 
 import imgfile, uu, os
 

diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py
index 72f3e40ad9054ed2117b63315e75c724d5e125ba..e41cf8be886c466be5729e6f06499263b6a4969a 100644 (file)
--- a/Lib/test/test_minidom.py
+++ b/Lib/test/test_minidom.py
@@ -7,7 +7,7 @@ import xml.parsers.expat
 import os.path
 import sys
 import traceback
-from test_support import verify, verbose
+from test_support import verbose
 
 if __name__ == "__main__":
     base = sys.argv[0]
@@ -81,7 +81,7 @@ def testLegalChildren():
     dom = Document()
     elem = dom.createElement('element')
     text = dom.createTextNode('text')
-    
+
     try: dom.appendChild(text)
     except HierarchyRequestErr: pass
     else:
@@ -99,7 +99,7 @@ def testLegalChildren():
         print "dom.appendChild didn't raise HierarchyRequestErr"
 
     elem.appendChild(text)
-    dom.unlink() 
+    dom.unlink()
 
 def testNonZero():
     dom = parse(tstfile)
@@ -395,7 +395,7 @@ def _testCloneElementCopiesAttributes(e1, e2, test):
                 , "clone of attribute node has proper attribute values")
         confirm(a2.ownerElement is e2,
                 "clone of attribute node correctly owned")
-    
+
 
 def testCloneDocumentShallow(): pass
 

diff --git a/Lib/test/test_new.py b/Lib/test/test_new.py
index 929155cbb6e06d5f052028bec5965ee22800c6c4..70ea38bea5ea87dc7ac0202413cf8232a48650e6 100644 (file)
--- a/Lib/test/test_new.py
+++ b/Lib/test/test_new.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose
+from test_support import verbose
 import sys
 import new
 

diff --git a/Lib/test/test_nis.py b/Lib/test/test_nis.py
index 56382c5de114b2b9a80a11f32acd7b0b6c0285fd..e1670d16e544531c2f8eda197b7ceb1423297cc8 100644 (file)
--- a/Lib/test/test_nis.py
+++ b/Lib/test/test_nis.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose, TestFailed, TestSkipped
+from test_support import verbose, TestFailed, TestSkipped
 import nis
 
 print 'nis.maps()'

diff --git a/Lib/test/test_openpty.py b/Lib/test/test_openpty.py
index cd0191f19461323d1d90ebde74b7033fb1ca96c1..fb817193d5109501799e74ef0c8ed58843be76aa 100644 (file)
--- a/Lib/test/test_openpty.py
+++ b/Lib/test/test_openpty.py
@@ -1,7 +1,7 @@
 # Test to see if openpty works. (But don't worry if it isn't available.)
 
 import os
-from test_support import verify, verbose, TestFailed, TestSkipped
+from test_support import verbose, TestFailed, TestSkipped
 
 try:
     if verbose:

diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py
index 891855a6eaee0ae555606d70f262622e45f27078..6885767b524f55e2493d7b112aab52db6580f764 100644 (file)
--- a/Lib/test/test_parser.py
+++ b/Lib/test/test_parser.py
@@ -3,7 +3,7 @@ import parser
 import pprint
 import sys
 
-from test_support import verify, TestFailed
+from test_support import TestFailed
 
 #
 #  First, we test that we can generate trees from valid source fragments,

diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index 03543128acc10716d5d034a449b6daeb1afe8b8c..5ea7e6f7d0844251364bfd302c07e4a0c2904f14 100644 (file)
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -1,5 +1,5 @@
 import pty, os, sys, string
-from test_support import verify, verbose, TestFailed, TestSkipped
+from test_support import verbose, TestFailed, TestSkipped
 
 TEST_STRING_1 = "I wish to buy a fish license."
 TEST_STRING_2 = "For my pet fish, Eric."

diff --git a/Lib/test/test_pwd.py b/Lib/test/test_pwd.py
index d179ed018644064e741122038e88b17c64bfc8a0..7425f53b384db0a3dd73361ddcf5803022bc81f1 100644 (file)
--- a/Lib/test/test_pwd.py
+++ b/Lib/test/test_pwd.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose
+from test_support import verbose
 import pwd
 import string
 

diff --git a/Lib/test/test_regex.py b/Lib/test/test_regex.py
index a49abead61e555cd6d13aa94b2d257357fcd3998..a32482152c1e31f318e212f15080c4265c984a94 100644 (file)
--- a/Lib/test/test_regex.py
+++ b/Lib/test/test_regex.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose
+from test_support import verbose
 import warnings
 warnings.filterwarnings("ignore", "the regex module is deprecated",
                         DeprecationWarning, __name__)

diff --git a/Lib/test/test_rfc822.py b/Lib/test/test_rfc822.py
index c6df925d9affdc9305520b2a63575ab03822d016..967b91b70deea4e951877854643df6a6f36e9649 100644 (file)
--- a/Lib/test/test_rfc822.py
+++ b/Lib/test/test_rfc822.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose
+from test_support import verbose
 import rfc822, sys
 try:
     from cStringIO import StringIO

diff --git a/Lib/test/test_rgbimg.py b/Lib/test/test_rgbimg.py
index b078d47e5b08ab5aa4b857a45613e13a47e8c397..f2622e40674abccd332f0e4d6ba255c9cd07f225 100644 (file)
--- a/Lib/test/test_rgbimg.py
+++ b/Lib/test/test_rgbimg.py
@@ -2,7 +2,7 @@
 
 import rgbimg, os, uu
 
-from test_support import verify, verbose, unlink, findfile
+from test_support import verbose, unlink, findfile
 
 class error(Exception):
     pass

diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py
index be12923430c2c9facb7f3eeb157de897577a7078..d5bcfd554723271e5daab4e81f53066686182bc0 100644 (file)
--- a/Lib/test/test_select.py
+++ b/Lib/test/test_select.py
@@ -1,5 +1,5 @@
 # Testing select module
-from test_support import verify, verbose
+from test_support import verbose
 import select
 import os
 

diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 9d4c277e83b8deac157aa6ab6ea50f7bb9d0d08c..a6c32b46c0bffa4050bb62a2dff4040627ee2596 100644 (file)
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -1,5 +1,5 @@
 # Test the signal module
-from test_support import verify, verbose, TestSkipped
+from test_support import verbose, TestSkipped
 import signal
 import os
 import sys

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index dab432f24e00eea2145a3e674f34be4a7088a651..fe3793615d202a317e8b1229f2efc235f872bc1b 100644 (file)
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -8,7 +8,7 @@
 #       sktobj.shutdown()
 
 
-from test_support import verify, verbose, TestFailed
+from test_support import verbose, TestFailed
 import socket
 import os
 import time

diff --git a/Lib/test/test_sre.py b/Lib/test/test_sre.py
index 0aa834971d887bd27301c3e4ab5dffb2e5dc8d70..88c0d62e8db8d1ee1ad3e408709df6fbbf3b9727 100644 (file)
--- a/Lib/test/test_sre.py
+++ b/Lib/test/test_sre.py
@@ -6,7 +6,7 @@
 import sys
 sys.path=['.']+sys.path
 
-from test_support import verify, verbose, TestFailed
+from test_support import verbose, TestFailed
 import sre
 import sys, os, string, traceback
 

diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py
index 73de2d34c74e8b94981eeedce6283324e28001e7..7f5cb8035e4451e375d96c27a4659061beed9b66 100755 (executable)
--- a/Lib/test/test_strftime.py
+++ b/Lib/test/test_strftime.py
@@ -3,7 +3,7 @@
 # Sanity checker for time.strftime
 
 import time, calendar, sys, string, os, re
-from test_support import verify, verbose
+from test_support import verbose
 
 def main():
     global verbose

diff --git a/Lib/test/test_string.py b/Lib/test/test_string.py
index fd1cbae14fcf293f1ba8e15fd133bab1a72eb337..3574719df484aaf7fc40f4fd00aa6b18a2b553a9 100644 (file)
--- a/Lib/test/test_string.py
+++ b/Lib/test/test_string.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose, TestSkipped
+from test_support import verbose, TestSkipped
 import string_tests
 import string, sys
 

diff --git a/Lib/test/test_strop.py b/Lib/test/test_strop.py
index d444f3d523e4a94f24a51a50f7e1596fafa31dee..57700460da3b1d6bbe702c8bf307e9433b960f14 100644 (file)
--- a/Lib/test/test_strop.py
+++ b/Lib/test/test_strop.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose
+from test_support import verbose
 import strop, sys
 
 def test(name, input, output, *args):

diff --git a/Lib/test/test_sunaudiodev.py b/Lib/test/test_sunaudiodev.py
index 4083c689d9a67d57594be0467079f2ebd55f520f..af18761310856ea7d119eb2fcde74d62989b8770 100644 (file)
--- a/Lib/test/test_sunaudiodev.py
+++ b/Lib/test/test_sunaudiodev.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose, findfile, TestFailed
+from test_support import verbose, findfile, TestFailed
 import sunaudiodev
 import os
 

diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index 134badfae3c535691f78d9754ad4563c514ccae3..02da94e75d131e1f1022e74aee762cab3f3b9929 100644 (file)
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -2,7 +2,7 @@
 
 # Create a bunch of threads, let each do some work, wait until all are done
 
-from test_support import verify, verbose
+from test_support import verbose
 import random
 import thread
 import time

diff --git a/Lib/test/test_timing.py b/Lib/test/test_timing.py
index 984638eeb5cce96c992115371964216ab10cad86..5dbc895385c682ba83845d04ee703be1a8ce41b1 100644 (file)
--- a/Lib/test/test_timing.py
+++ b/Lib/test/test_timing.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose
+from test_support import verbose
 import timing
 
 r = range(100000)

diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index 52d43008226c02ed108516a24b952f0b70b6012c..a0713d184c3d270848836f2221d2e7c68700b342 100644 (file)
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose, findfile
+from test_support import verbose, findfile
 import tokenize, os, sys
 
 if verbose:

diff --git a/Lib/test/test_userlist.py b/Lib/test/test_userlist.py
index da866ccd402ff5460692b07ed94a0be26fecf0d8..e655d1f6cbbaa88d437f97ccaa9ec82256b06d5d 100644 (file)
--- a/Lib/test/test_userlist.py
+++ b/Lib/test/test_userlist.py
@@ -3,8 +3,9 @@
 from UserList import UserList
 from test_support import TestFailed
 
-# Use check instead of verify(so -O doesn't render the)
+# Use check instead of assert so -O doesn't render the
 # test useless.
+# XXX: could use the verify function in test_support instead
 def check(predicate, msg):
     if not predicate:
         raise TestFailed(msg + " failed")

diff --git a/Lib/test/test_userstring.py b/Lib/test/test_userstring.py
index 4f54db2a43f7076f0ca3f32d5c1a7813dee8d1e8..a47bfdd9df55c523499eefcfedb5fb9df3a0950c 100755 (executable)
--- a/Lib/test/test_userstring.py
+++ b/Lib/test/test_userstring.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import sys, string
-from test_support import verify, verbose
+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.

diff --git a/Lib/test/test_winreg.py b/Lib/test/test_winreg.py
index 20df7de8a1bbd6475396b05b2e9df845deb9738f..02bc749f2428507f88d8a15006b7b6fb2d33752b 100644 (file)
--- a/Lib/test/test_winreg.py
+++ b/Lib/test/test_winreg.py
@@ -4,6 +4,8 @@
 from _winreg import *
 import os, sys
 
+from test_support import verify
+
 test_key_name = "SOFTWARE\\Python Registry Test Key - Delete Me"
 
 test_data = [

diff --git a/Lib/test/test_xmllib.py b/Lib/test/test_xmllib.py
index 32f6b85baf33a5ad553860497e0bb36417cb2db7..62803b5869084228a55253ec6819310d03ef14fb 100644 (file)
--- a/Lib/test/test_xmllib.py
+++ b/Lib/test/test_xmllib.py
@@ -2,7 +2,7 @@
    Sjoerd Mullender
 '''
 
-from test_support import verify, verbose
+from test_support import verbose
 
 testdoc = """\
 <?xml version="1.0" encoding="UTF-8" standalone='yes' ?>