String method conversion.

(This one was trivial -- no actual string. references in it!)

diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 45bcdc1bbca79d2a3b0ebdec17484825970227c7..362483f6db50f2b76e8b5f441554fce52c3f302c 100644 (file)
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -1,5 +1,4 @@
 import posixpath
-import string
 
 errors = 0
 

diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index 5ea7e6f7d0844251364bfd302c07e4a0c2904f14..2a2d81811e4c7722dfcc9e99c5ac9dd4383d37a8 100644 (file)
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -1,4 +1,4 @@
-import pty, os, sys, string
+import pty, os, sys
 from test_support import verbose, TestFailed, TestSkipped
 
 TEST_STRING_1 = "I wish to buy a fish license."

diff --git a/Lib/test/test_pwd.py b/Lib/test/test_pwd.py
index 7425f53b384db0a3dd73361ddcf5803022bc81f1..2cb122beeea6c458900cc03387452390f780fab9 100644 (file)
--- a/Lib/test/test_pwd.py
+++ b/Lib/test/test_pwd.py
@@ -1,6 +1,5 @@
 from test_support import verbose
 import pwd
-import string
 
 print 'pwd.getpwall()'
 entries = pwd.getpwall()
@@ -50,7 +49,7 @@ while bynames.has_key(fakename):
         except IndexError:
             # should never happen... if so, just forget it
             break
-    fakename = string.join(map(None, chars), '')
+    fakename = ''.join(map(None, chars))
 
 try:
     pwd.getpwnam(fakename)

diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index 8ab6c7f8721196709ebec7a4a530bab7e53eb595..2552857ab87d6d43d5caef02354249eedf8f7d52 100644 (file)
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -3,7 +3,7 @@ sys.path = ['.'] + sys.path
 
 from test_support import verify, verbose, TestFailed
 import re
-import sys, os, string, traceback
+import sys, os, traceback
 
 # Misc tests from Tim Peters' re.doc
 

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

diff --git a/Lib/test/test_userstring.py b/Lib/test/test_userstring.py
index a47bfdd9df55c523499eefcfedb5fb9df3a0950c..a8df84d7ba323e7492974b7e2c326b86df70ff14 100755 (executable)
--- a/Lib/test/test_userstring.py
+++ b/Lib/test/test_userstring.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import sys, string
+import sys
 from test_support import verbose
 import string_tests
 # UserString is a wrapper around the native builtin string type.