Index: subversion/tests/cmdline/import_tests.py
===================================================================
--- subversion/tests/cmdline/import_tests.py	(revision 21317)
+++ subversion/tests/cmdline/import_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import string, re, os.path
+import re, os.path
 
 # Our testing module
 import svntest
@@ -68,7 +68,7 @@
     '--password', svntest.main.wc_passwd,
     '-m', 'Log message for new import', xt_path, url)
 
-  lastline = string.strip(output.pop())
+  lastline = output.pop().strip()
   cm = re.compile ("(Committed|Imported) revision [0-9]+.")
   match = cm.search (lastline)
   if not match:
@@ -150,7 +150,7 @@
     '-m', 'Log message for new import',
     dir_path, url)
 
-  lastline = string.strip(output.pop())
+  lastline = output.pop().strip()
   cm = re.compile ("(Committed|Imported) revision [0-9]+.")
   match = cm.search (lastline)
   if not match:
@@ -219,7 +219,7 @@
     '-m', 'Log message for new import', '--no-ignore', 
     dir_path, url)
 
-  lastline = string.strip(output.pop())
+  lastline = output.pop().strip()
   cm = re.compile ("(Committed|Imported) revision [0-9]+.")
   match = cm.search (lastline)
   if not match:
Index: subversion/tests/cmdline/autoprop_tests.py
===================================================================
--- subversion/tests/cmdline/autoprop_tests.py	(revision 21317)
+++ subversion/tests/cmdline/autoprop_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import string, sys, re, os, os.path, shutil
+import sys, re, os, os.path, shutil
 
 # Our testing module
 import svntest
@@ -36,7 +36,7 @@
 
   out2 = []
   for line in out[1:]:
-    out2 = out2 + [string.strip(line)]
+    out2 = out2 + [line.strip()]
   out2.sort()
   exp_out.sort()
   if out2 != exp_out:
Index: subversion/tests/cmdline/basic_tests.py
===================================================================
--- subversion/tests/cmdline/basic_tests.py	(revision 21317)
+++ subversion/tests/cmdline/basic_tests.py	(working copy)
@@ -17,7 +17,7 @@
 ######################################################################
 
 # General modules
-import shutil, stat, string, sys, re, os.path
+import shutil, stat, sys, re, os.path
 
 # Our testing module
 import svntest
@@ -1222,7 +1222,7 @@
     '--password', svntest.main.wc_passwd,
     '-m', 'Log message for new import', new_path, url)
 
-  lastline = string.strip(output.pop())
+  lastline = output.pop().strip()
   cm = re.compile ("(Committed|Imported) revision [0-9]+.")
   match = cm.search (lastline)
   if not match:
@@ -1513,7 +1513,7 @@
 
   # Revision 6638 made 'svn co http://host' seg fault, this tests the fix.
   url = svntest.main.current_repo_url
-  scheme = url[:string.find(url, ":")]
+  scheme = url[:url.find(":")]
   url = scheme + "://some_nonexistent_host_with_no_trailing_slash"
   svntest.actions.run_and_verify_svn("No error where one expected",
                                      None, SVNAnyOutput,
@@ -1534,7 +1534,7 @@
   output, errput = svntest.main.run_svn(1, 'co', iota_url)
 
   for line in errput:
-    if string.find(line, "refers to a file") != -1:
+    if line.find("refers to a file") != -1:
       break
   else:
     raise svntest.Failure