summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2001-02-09 12:00:47 +0000
committerEric S. Raymond <esr@thyrsus.com>2001-02-09 12:00:47 +0000
commitf2c6194e10210fce9cab320b7d0e5d3fcc61f340 (patch)
tree16d48da4574357924fa7877278f002feb352e85c
parent9c034cef51db10928b553a8c062d81546572cae2 (diff)
downloadcpython-f2c6194e10210fce9cab320b7d0e5d3fcc61f340.tar.gz
String method conversion.
(This one was trivial -- no actual string. references in it!)
-rw-r--r--Lib/test/test_posixpath.py1
-rw-r--r--Lib/test/test_pty.py2
-rw-r--r--Lib/test/test_pwd.py3
-rw-r--r--Lib/test/test_re.py2
-rw-r--r--Lib/test/test_sre.py2
-rwxr-xr-xLib/test/test_userstring.py2
6 files changed, 5 insertions, 7 deletions
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 45bcdc1bbc..362483f6db 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 5ea7e6f7d0..2a2d81811e 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 7425f53b38..2cb122beee 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 8ab6c7f872..2552857ab8 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 88c0d62e8d..89364d5fc8 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 a47bfdd9df..a8df84d7ba 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.