Index: subversion/tests/cmdline/autoprop_tests.py
===================================================================
--- subversion/tests/cmdline/autoprop_tests.py	(revision 22441)
+++ subversion/tests/cmdline/autoprop_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import sys, re, os, os.path, shutil
+import os
 
 # Our testing module
 import svntest
Index: subversion/tests/cmdline/basic_tests.py
===================================================================
--- subversion/tests/cmdline/basic_tests.py	(revision 22441)
+++ subversion/tests/cmdline/basic_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import shutil, stat, sys, re, os.path
+import shutil, stat, re, os.path
 
 # Our testing module
 import svntest
Index: subversion/tests/cmdline/copy_tests.py
===================================================================
--- subversion/tests/cmdline/copy_tests.py	(revision 22441)
+++ subversion/tests/cmdline/copy_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import stat, sys, os, shutil, re
+import stat, os, re
 
 # Our testing module
 import svntest
Index: subversion/tests/cmdline/diff_tests.py
===================================================================
--- subversion/tests/cmdline/diff_tests.py	(revision 22441)
+++ subversion/tests/cmdline/diff_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import string, sys, re, os.path
+import sys, re, os.path
 
 # Our testing module
 import svntest
@@ -40,7 +40,7 @@
 
 # On Windows, diffs still display / rather than \ in paths
   if svntest.main.windows == 1:
-    name = string.replace(name, '\\', '/')
+    name = name.replace('\\', '/')
   i_re = re.compile('^Index:')
   d_re = re.compile('^Index: (\\./)?' + name)
   p_re = re.compile('^--- (\\./)?' + name)
Index: subversion/tests/cmdline/export_tests.py
===================================================================
--- subversion/tests/cmdline/export_tests.py	(revision 22441)
+++ subversion/tests/cmdline/export_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import shutil, sys, re, os
+import os
 
 # Our testing module
 import svntest
Index: subversion/tests/cmdline/externals_tests.py
===================================================================
--- subversion/tests/cmdline/externals_tests.py	(revision 22441)
+++ subversion/tests/cmdline/externals_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import shutil, sys, re, os
+import os
 import warnings
 
 # Our testing module
Index: subversion/tests/cmdline/history_tests.py
===================================================================
--- subversion/tests/cmdline/history_tests.py	(revision 22441)
+++ subversion/tests/cmdline/history_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import shutil, stat, sys, re, os.path
+import os.path
 
 # Our testing module
 import svntest
Index: subversion/tests/cmdline/lock_tests.py
===================================================================
--- subversion/tests/cmdline/lock_tests.py	(revision 22441)
+++ subversion/tests/cmdline/lock_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import sys, re, os.path, shutil, stat
+import re, os.path, stat
 
 # Our testing module
 import svntest
Index: subversion/tests/cmdline/log_tests.py
===================================================================
--- subversion/tests/cmdline/log_tests.py	(revision 22441)
+++ subversion/tests/cmdline/log_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import string, sys, re, os, shutil
+import string, re, os
 
 # Our testing module
 import svntest
Index: subversion/tests/cmdline/prop_tests.py
===================================================================
--- subversion/tests/cmdline/prop_tests.py	(revision 22441)
+++ subversion/tests/cmdline/prop_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import sys, re, os.path, shutil
+import sys, re, os.path
 
 # Our testing module
 import svntest
Index: subversion/tests/cmdline/revert_tests.py
===================================================================
--- subversion/tests/cmdline/revert_tests.py	(revision 22441)
+++ subversion/tests/cmdline/revert_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import shutil, sys, stat, re, os
+import re, os
 
 # Our testing module
 import svntest
Index: subversion/tests/cmdline/schedule_tests.py
===================================================================
--- subversion/tests/cmdline/schedule_tests.py	(revision 22441)
+++ subversion/tests/cmdline/schedule_tests.py	(working copy)
@@ -18,7 +18,7 @@
 ######################################################################
 
 # General modules
-import sys, os, shutil
+import os
 
 # Our testing module
 import svntest
Index: subversion/tests/cmdline/stat_tests.py
===================================================================
--- subversion/tests/cmdline/stat_tests.py	(revision 22441)
+++ subversion/tests/cmdline/stat_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import sys, os.path, re, time
+import os.path, re, time
 
 # Our testing module
 import svntest
Index: subversion/tests/cmdline/svnadmin_tests.py
===================================================================
--- subversion/tests/cmdline/svnadmin_tests.py	(revision 22441)
+++ subversion/tests/cmdline/svnadmin_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import string, sys, re, os.path
+import os.path
 
 # Our testing module
 import svntest
@@ -68,7 +68,7 @@
   "Get the txn names using 'svnadmin lstxns'."
 
   output_lines, error_lines = svntest.main.run_svnadmin('lstxns', repo_dir)
-  txns = map(string.strip, output_lines)
+  txns = map(output_lines.strip, output_lines)
 
   # sort, just in case
   txns.sort()
Index: subversion/tests/cmdline/svnlook_tests.py
===================================================================
--- subversion/tests/cmdline/svnlook_tests.py	(revision 22441)
+++ subversion/tests/cmdline/svnlook_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import string, sys, re, os.path
+import re, os.path
 
 # Our testing module
 import svntest
@@ -209,8 +209,8 @@
   # Okay.  No failure, but did we get the right output?
   if len(output) != 2:
     raise svntest.Failure
-  if not ((string.strip(output[0]) == 'A/B/')
-          and (string.strip(output[1]) == 'A/B/E2/')):
+  if not ((output[0].strip() == 'A/B/')
+          and (output[1].strip() == 'A/B/E2/')):
     raise svntest.Failure
 
 
@@ -248,7 +248,7 @@
 
   # replace wcdir/iota with iota in expected_output
   for i in xrange(len(expected_output)):
-    expected_output[i] = string.replace(expected_output[i], iota_path, 'iota')
+    expected_output[i] = expected_output[i].replace(iota_path, 'iota')
 
   svntest.actions.compare_and_display_lines('', '', expected_output, output)
 
Index: subversion/tests/cmdline/svnsync_tests.py
===================================================================
--- subversion/tests/cmdline/svnsync_tests.py	(revision 22441)
+++ subversion/tests/cmdline/svnsync_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import string, sys, re, os.path
+import sys, os.path
 
 # Our testing module
 import svntest
Index: subversion/tests/cmdline/switch_tests.py
===================================================================
--- subversion/tests/cmdline/switch_tests.py	(revision 22441)
+++ subversion/tests/cmdline/switch_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import shutil, sys, re, os
+import shutil, re, os
 
 # Our testing module
 import svntest
Index: subversion/tests/cmdline/trans_tests.py
===================================================================
--- subversion/tests/cmdline/trans_tests.py	(revision 22441)
+++ subversion/tests/cmdline/trans_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import sys, os.path, re
+import os.path, re
 
 # Our testing module
 import svntest
Index: subversion/tests/cmdline/update_tests.py
===================================================================
--- subversion/tests/cmdline/update_tests.py	(revision 22441)
+++ subversion/tests/cmdline/update_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import shutil, string, sys, re, os
+import sys, re, os
 
 # Our testing module
 import svntest
@@ -2108,7 +2108,7 @@
   		import win32api
 
   		drives=win32api.GetLogicalDriveStrings()
-  		drives=string.splitfields(drives,'\000')
+  		drives=drives.splitfields('\000')
 
   		for d in range(ord('G'), ord('Z')+1):
   		  drive = chr(d)
Index: subversion/tests/cmdline/utf8_tests.py
===================================================================
--- subversion/tests/cmdline/utf8_tests.py	(revision 22441)
+++ subversion/tests/cmdline/utf8_tests.py	(working copy)
@@ -18,7 +18,7 @@
 ######################################################################
 
 # General modules
-import shutil, stat, sys, re, os.path, os, locale
+import sys, re, os, locale
 
 # Our testing module
 import svntest