Index: subversion/tests/cmdline/svntest/testcase.py =================================================================== --- subversion/tests/cmdline/svntest/testcase.py (revision 22468) +++ subversion/tests/cmdline/svntest/testcase.py (working copy) @@ -15,7 +15,7 @@ # ###################################################################### -import os, sys, string, types +import os, types import svntest @@ -40,7 +40,7 @@ print 'WARNING: Test doc string exceeds 50 characters' if description[-1] == '.': print 'WARNING: Test doc string ends in a period (.)' - if not string.lower(description[0]) == description[0]: + if not description[0].lower() == description[0]: print 'WARNING: Test doc string is capitalized' def need_sandbox(self): Index: subversion/tests/cmdline/svntest/tree.py =================================================================== --- subversion/tests/cmdline/svntest/tree.py (revision 22468) +++ subversion/tests/cmdline/svntest/tree.py (working copy) @@ -16,7 +16,6 @@ ###################################################################### import re -import string import os import sys @@ -278,7 +277,7 @@ # get a list of all the names in the path # each of these will be a child of the former if os.sep != "/": - path = string.replace(path, os.sep, "/") + path = path.replace(os.sep, "/") elements = path.split("/") if len(elements) == 0: ### we should raise a less generic error here. which? @@ -331,8 +330,8 @@ # Not a misprint; "> 0" really is preferable to ">= 0" in this case. if line.find(' : ') > 0: name, value = line.split(' : ') - name = string.strip(name) - value = string.strip(value) + name = name.strip() + value = value.strip() props[name] = value first_value = 1 else: # Multi-line property, so re-use the current name. @@ -550,8 +549,8 @@ else: print "%s%s" % (indent, n.name) - indent = string.replace(indent, "-", " ") - indent = string.replace(indent, "+", " ") + indent = indent.replace("-", " ") + indent = indent.replace("+", " ") for i in range(len(tmp_children)): c = tmp_children[i] if i == len(tmp_children Index: subversion/tests/cmdline/svntest/actions.py =================================================================== --- subversion/tests/cmdline/svntest/actions.py (revision 22468) +++ subversion/tests/cmdline/svntest/actions.py (working copy) @@ -15,7 +15,7 @@ # ###################################################################### -import os, shutil, string, re, sys, errno +import os, shutil, re, sys, errno import main, tree, wc # general svntest routines in this module. from svntest import Failure, SVNAnyOutput @@ -92,7 +92,7 @@ sys.exit(1) # verify the printed output of 'svn import'. - lastline = string.strip(output.pop()) + lastline = output.pop().strip() cm = re.compile ("(Committed|Imported) revision [0-9]+.") match = cm.search (lastline) if not match: @@ -682,7 +682,7 @@ # Remove the final output line, and verify that the commit succeeded. lastline = "" if len(output): - lastline = string.strip(output.pop()) + lastline = output.pop().strip() cm = re.compile("(Committed|Imported) revision [0-9]+.") match = cm.search(lastline) Index: subversion/tests/cmdline/svntest/main.py =================================================================== --- subversion/tests/cmdline/svntest/main.py (revision 22468) +++ subversion/tests/cmdline/svntest/main.py (working copy) @@ -20,7 +20,6 @@ import shutil # for rmtree() import re import stat # for ST_MODE -import string # for atof() import copy # for deepcopy() import time # for time() import traceback # for print_exc() @@ -137,7 +136,7 @@ # Global URL to testing area. Default to ra_local, current working dir. test_area_url = file_scheme_prefix + os.path.abspath(os.getcwd()) if windows == 1: - test_area_url = string.replace(test_area_url, '\\', '/') + test_area_url = test_area_url.replace('\\', '/') # Global variable indicating the FS type for repository creations. fs_type = None @@ -610,7 +609,7 @@ self.authz_file = os.path.join(self.repo_dir, "conf", "authz") if windows == 1: - self.repo_url = string.replace(self.repo_url, '\\', '/') + self.repo_url = self.repo_url.replace('\\', '/') self.test_paths = [self.wc_dir, self.repo_dir] def clone_dependent(self): @@ -881,7 +880,7 @@ # Calculate pristine_url from test_area_url. pristine_url = test_area_url + '/' + pristine_dir if windows == 1: - pristine_url = string.replace(pristine_url, '\\', '/') + pristine_url = pristine_url.replace('\\', '/') # Setup the pristine repository (and working copy) actions.setup_pristine_repository()