From 2846b0ab417dbfc76d2f9b52b5613ad4fe8feb63 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Fri, 9 Feb 2001 12:00:47 +0000
Subject: [PATCH] String method conversion. (This one was trivial -- no actual
 string. references in it!)

---
 Lib/test/test_posixpath.py  | 1 -
 Lib/test/test_pty.py        | 2 +-
 Lib/test/test_pwd.py        | 3 +--
 Lib/test/test_re.py         | 2 +-
 Lib/test/test_sre.py        | 2 +-
 Lib/test/test_userstring.py | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 45bcdc1bbca..362483f6db5 100644
--- 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 5ea7e6f7d08..2a2d81811e4 100644
--- 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 7425f53b384..2cb122beeea 100644
--- 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 8ab6c7f8721..2552857ab87 100644
--- 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 88c0d62e8db..89364d5fc8f 100644
--- 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 a47bfdd9df5..a8df84d7ba3 100755
--- 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.