String method conversion.

3 files changed, 5 insertions, 7 deletions

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index fe37936..00a4a91 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -12,7 +12,6 @@ from test_support import verbose, TestFailed
 import socket
 import os
 import time
-import string
 
 def missing_ok(str):
     try:
@@ -79,7 +78,7 @@ if verbose:
     print all_host_names
 
 for name in all_host_names:
-    if string.find(name, '.'):
+    if name.find('.'):
         break
 else:
     print 'FQDN not found'
diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py
index 7f5cb80..fd024b9 100755
--- a/Lib/test/test_strftime.py
+++ b/Lib/test/test_strftime.py
@@ -2,7 +2,7 @@
 
 # Sanity checker for time.strftime
 
-import time, calendar, sys, string, os, re
+import time, calendar, sys, os, re
 from test_support import verbose
 
 def main():
@@ -90,7 +90,7 @@ def strftest(now):
 
     if verbose:
         print "Strftime test, platform: %s, Python version: %s" % \
-              (sys.platform, string.split(sys.version)[0])
+              (sys.platform, sys.version.split()[0])
 
     for e in expectations:
         try:
diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
index 7f01114..c672ef7 100644
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -1,7 +1,6 @@
 import zlib
 import sys
 import imp
-import string
 
 try:
     t = imp.find_module('test_zlib')
@@ -57,7 +56,7 @@ bufs = []
 for i in range(0, len(buf), 256):
     bufs.append(co.compress(buf[i:i+256]))
 bufs.append(co.flush())
-combuf = string.join(bufs, '')
+combuf = ''.join(bufs)
 
 decomp1 = zlib.decompress(combuf, -12, -5)
 if decomp1 != buf:
@@ -70,7 +69,7 @@ bufs = []
 for i in range(0, len(combuf), 128):
     bufs.append(deco.decompress(combuf[i:i+128]))
 bufs.append(deco.flush())
-decomp2 = string.join(buf, '')
+decomp2 = ''.join(buf)
 if decomp2 != buf:
     print "decompressobj with init options failed"
 else: