Apply diff2.txt from SF patch http://www.python.org/sf/572113

(with one small bugfix in bgen/bgen/scantools.py)

This replaces string module functions with string methods
for the stuff in the Tools directory. Several uses of
string.letters etc. are still remaining.

Author: doerwalter

Tools/audiopy/audiopy

@@ -47,7 +47,6 @@ Other options are:
 
 import sys
 import os
-import string
 import errno
 import sunaudiodev
 from SUNAUDIODEV import *
@@ -372,9 +371,9 @@ class Helpwin:
                 fp = open(readmefile)
                 contents = fp.read()
                 # wax the last page, it contains Emacs cruft
-                i = string.rfind(contents, '\f')
+                i = contents.rfind('\f')
                 if i > 0:
-                    contents = string.rstrip(contents[:i])
+                    contents = contents[:i].rstrip()
             finally:
                 if fp:
                     fp.close()

Tools/bgen/bgen/bgenGenerator.py

@@ -131,7 +131,6 @@ def parseArgumentList(self, argumentList):
 			self.argumentList.append(arg)
 
 	def docstring(self):
-		import string
 		input = []
 		output = []
 		for arg in self.argumentList:
@@ -156,11 +155,11 @@ def docstring(self):
 		if not input:
 			instr = "()"
 		else:
-			instr = "(%s)" % string.joinfields(input, ", ")
+			instr = "(%s)" % ", ".join(input)
 		if not output or output == ["void"]:
 			outstr = "None"
 		else:
-			outstr = "(%s)" % string.joinfields(output, ", ")
+			outstr = "(%s)" % ", ".join(output)
 		return instr + " -> " + outstr
 
 	def functionbody(self):

Tools/bgen/bgen/bgenOutput.py

@@ -69,12 +69,11 @@ def VaOutput(format, args):
 	text = format % args
 	if _Level > 0:
 		indent = '\t' * _Level
-		import string
-		lines = string.splitfields(text, '\n')
+		lines = text.split('\n')
 		for i in range(len(lines)):
 			if lines[i] and lines[i][0] != '#':
 				lines[i] = indent + lines[i]
-		text = string.joinfields(lines, '\n')
+		text = '\n'.join(lines)
 	_File.write(text + '\n')
 
 def IndentLevel(by = 1):
@@ -168,13 +167,12 @@ def Out(text):
 	"""
 	# (Don't you love using triple quotes *inside* triple quotes? :-)
 
-	import string
-	lines = string.splitfields(text, '\n')
+	lines = text.split('\n')
 	indent = ""
 	for line in lines:
-		if string.strip(line):
+		if line.strip():
 			for c in line:
-				if c not in string.whitespace:
+				if not c.isspace():
 					break
 				indent = indent + c
 			break

Tools/bgen/bgen/scantools.py

@@ -15,7 +15,6 @@
 """
 
 import re
-import string
 import sys
 import os
 import fnmatch
@@ -67,8 +66,8 @@ def reportusedtypes(self):
 		for type in types:
 			modes = self.usedtypes[type].keys()
 			modes.sort()
-			self.report("%s %s", type, string.join(modes))
-			
+			self.report("%s %s", type, " ".join(modes))
+
 	def gentypetest(self, file):
 		fp = open(file, "w")
 		fp.write("types=[\n")
@@ -163,9 +162,9 @@ def makerepairinstructions(self):
 			while line[-2:] == '\\\n':
 				line = line[:-2] + ' ' + f.readline()
 				lineno = lineno + 1
-			i = string.find(line, '#')
+			i = line.find('#')
 			if i >= 0: line = line[:i]
-			words = map(string.strip, string.splitfields(line, ':'))
+			words = [s.strip() for s in line.split(':')]
 			if words == ['']: continue
 			if len(words) <> 3:
 				print "Line", startlineno,
@@ -179,16 +178,16 @@ def makerepairinstructions(self):
 				print "Empty pattern"
 				print `line`
 				continue
-			patparts = map(string.strip, string.splitfields(pat, ','))
-			repparts = map(string.strip, string.splitfields(rep, ','))
+			patparts = [s.strip() for s in pat.split(',')]
+			repparts = [s.strip() for s in rep.split(',')]
 			patterns = []
 			for p in patparts:
 				if not p:
 					print "Line", startlineno,
 					print "Empty pattern part"
 					print `line`
 					continue
-				pattern = string.split(p)
+				pattern = p.split()
 				if len(pattern) > 3:
 					print "Line", startlineno,
 					print "Pattern part has > 3 words"
@@ -205,7 +204,7 @@ def makerepairinstructions(self):
 					print "Empty replacement part"
 					print `line`
 					continue
-				replacement = string.split(p)
+				replacement = p.split()
 				if len(replacement) > 3:
 					print "Line", startlineno,
 					print "Pattern part has > 3 words"
@@ -502,10 +501,10 @@ def processrawspec(self, raw):
 		self.generate(type, name, arglist)
 
 	def extractarglist(self, args):
-		args = string.strip(args)
+		args = args.strip()
 		if not args or args == "void":
 			return []
-		parts = map(string.strip, string.splitfields(args, ","))
+		parts = [s.strip() for s in args.split(",")]
 		arglist = []
 		for part in parts:
 			arg = self.extractarg(part)
@@ -524,7 +523,7 @@ def extractarg(self, part):
 			# array matches an optional [] after the argument name
 			type = type + " ptr "
 		type = re.sub("\*", " ptr ", type)
-		type = string.strip(type)
+		type = type.strip()
 		type = re.sub("[ \t]+", "_", type)
 		return self.modifyarg(type, name, mode)
 
@@ -581,7 +580,7 @@ def substituteargs(self, pattern, replacement, old):
 				if item[i] == '*':
 					newitem[i] = old[k][i]
 				elif item[i][:1] == '$':
-					index = string.atoi(item[i][1:]) - 1
+					index = int(item[i][1:]) - 1
 					newitem[i] = old[index][i]
 			new.append(tuple(newitem))
 		##self.report("old: %s", `old`)

Tools/faqwiz/faqwiz.py

@@ -11,7 +11,7 @@
 
 """
 
-import sys, string, time, os, stat, re, cgi, faqconf
+import sys, time, os, stat, re, cgi, faqconf
 from faqconf import *                   # This imports all uppercase names
 now = time.time()
 
@@ -33,14 +33,14 @@ def __init__(self, file, why=None):
         self.why = why
 
 def escape(s):
-    s = string.replace(s, '&', '&')
-    s = string.replace(s, '<', '&lt;')
-    s = string.replace(s, '>', '&gt;')
+    s = s.replace('&', '&amp;')
+    s = s.replace('<', '&lt;')
+    s = s.replace('>', '&gt;')
     return s
 
 def escapeq(s):
     s = escape(s)
-    s = string.replace(s, '"', '&quot;')
+    s = s.replace('"', '&quot;')
     return s
 
 def _interpolate(format, args, kw):
@@ -95,7 +95,7 @@ def translate(text, pre=0):
         list.append(repl)
     j = len(text)
     list.append(escape(text[i:j]))
-    return string.join(list, '')
+    return ''.join(list)
 
 def emphasize(line):
     return re.sub(r'\*([a-zA-Z]+)\*', r'<I>\1</I>', line)
@@ -109,7 +109,7 @@ def revparse(rev):
     m = revparse_prog.match(rev)
     if not m:
         return None
-    [major, minor] = map(string.atoi, m.group(1, 2))
+    [major, minor] = map(int, m.group(1, 2))
     return major, minor
 
 logon = 0
@@ -123,10 +123,10 @@ def load_cookies():
     if not os.environ.has_key('HTTP_COOKIE'):
         return {}
     raw = os.environ['HTTP_COOKIE']
-    words = map(string.strip, string.split(raw, ';'))
+    words = [s.strip() for s in raw.split(';')]
     cookies = {}
     for word in words:
-        i = string.find(word, '=')
+        i = word.find('=')
         if i >= 0:
             key, value = word[:i], word[i+1:]
             cookies[key] = value
@@ -140,10 +140,10 @@ def load_my_cookie():
         return {}
     import urllib
     value = urllib.unquote(value)
-    words = string.split(value, '/')
+    words = value.split('/')
     while len(words) < 3:
         words.append('')
-    author = string.join(words[:-2], '/')
+    author = '/'.join(words[:-2])
     email = words[-2]
     password = words[-1]
     return {'author': author,
@@ -194,7 +194,7 @@ def __getattr__(self, name):
         except (TypeError, KeyError):
             value = ''
         else:
-            value = string.strip(value)
+            value = value.strip()
         setattr(self, name, value)
         return value
 
@@ -209,15 +209,15 @@ def __init__(self, fp, file, sec_num):
         if fp:
             import rfc822
             self.__headers = rfc822.Message(fp)
-            self.body = string.strip(fp.read())
+            self.body = fp.read().strip()
         else:
             self.__headers = {'title': "%d.%d. " % sec_num}
             self.body = ''
 
     def __getattr__(self, name):
         if name[0] == '_':
             raise AttributeError
-        key = string.join(string.split(name, '_'), '-')
+        key = '-'.join(name.split('_'))
         try:
             value = self.__headers[key]
         except KeyError:
@@ -237,7 +237,7 @@ def load_version(self):
             if not line:
                 break
             if line[:5] == 'head:':
-                version = string.strip(line[5:])
+                version = line[5:].strip()
         p.close()
         self.version = version
 
@@ -262,10 +262,10 @@ def show(self, edit=1):
         emit(ENTRY_HEADER2, self)
         pre = 0
         raw = 0
-        for line in string.split(self.body, '\n'):
+        for line in self.body.split('\n'):
             # Allow the user to insert raw html into a FAQ answer
             # (Skip Montanaro, with changes by Guido)
-            tag = string.lower(string.rstrip(line))
+            tag = line.rstrip().lower()
             if tag == '<html>':
                 raw = 1
                 continue
@@ -275,14 +275,14 @@ def show(self, edit=1):
             if raw:
                 print line
                 continue
-            if not string.strip(line):
+            if not line.strip():
                 if pre:
                     print '</PRE>'
                     pre = 0
                 else:
                     print '<P>'
             else:
-                if line[0] not in string.whitespace:
+                if not line[0].isspace():
                     if pre:
                         print '</PRE>'
                         pre = 0
@@ -335,7 +335,7 @@ def parse(self, file):
         if not m:
             return None
         sec, num = m.group(1, 2)
-        return string.atoi(sec), string.atoi(num)
+        return int(sec), int(num)
 
     def list(self):
         # XXX Caller shouldn't modify result
@@ -432,7 +432,7 @@ def do_search(self):
                 return
             words = map(lambda w: r'\b%s\b' % w, words)
             if self.ui.querytype[:3] == 'any':
-                queries = [string.join(words, '|')]
+                queries = ['|'.join(words)]
             else:
                 # Each of the individual queries must match
                 queries = words
@@ -551,7 +551,7 @@ def do_recent(self):
         if not self.ui.days:
             days = 1
         else:
-            days = string.atof(self.ui.days)
+            days = float(self.ui.days)
         try:
             cutoff = now - days * 24 * 3600
         except OverflowError:
@@ -623,7 +623,7 @@ def rlog(self, command, entry=None):
         output = os.popen(command).read()
         sys.stdout.write('<PRE>')
         athead = 0
-        lines = string.split(output, '\n')
+        lines = output.split('\n')
         while lines and not lines[-1]:
             del lines[-1]
         if lines:
@@ -634,7 +634,7 @@ def rlog(self, command, entry=None):
         headrev = None
         for line in lines:
             if entry and athead and line[:9] == 'revision ':
-                rev = string.strip(line[9:])
+                rev = line[9:].split()
                 mami = revparse(rev)
                 if not mami:
                     print line
@@ -690,7 +690,7 @@ def shell(self, command):
         print '</PRE>'
 
     def do_new(self):
-        entry = self.dir.new(section=string.atoi(self.ui.section))
+        entry = self.dir.new(section=int(self.ui.section))
         entry.version = '*new*'
         self.prologue(T_EDIT)
         emit(EDITHEAD)
@@ -723,7 +723,7 @@ def do_review(self):
             entry = self.dir.open(self.ui.file)
             entry.load_version()
         # Check that the FAQ entry number didn't change
-        if string.split(self.ui.title)[:1] != string.split(entry.title)[:1]:
+        if self.ui.title.split()[:1] != entry.title.split()[:1]:
             self.error("Don't change the entry number please!")
             return
         # Check that the edited version is the current version
@@ -779,7 +779,7 @@ def commit(self, entry):
         if '\r' in self.ui.body:
             self.ui.body = re.sub('\r\n?', '\n', self.ui.body)
         # Normalize whitespace in title
-        self.ui.title = string.join(string.split(self.ui.title))
+        self.ui.title = ' '.join(self.ui.title.split())
         # Check that there were any changes
         if self.ui.body == entry.body and self.ui.title == entry.title:
             self.error("You didn't make any changes!")