Use string.replace instead of regsub.[g]sub.

gvanrossum · gvanrossum · commit 00f9fea288ba · 1997-12-24T21:18:41.000Z
diff --git a/Lib/CGIHTTPServer.py b/Lib/CGIHTTPServer.py
@@ -148,8 +148,7 @@ def run_cgi(self):
 	    if ua:
 		env['HTTP_USER_AGENT'] = ua
 	    # XXX Other HTTP_* headers
-	    import regsub
-	    decoded_query = regsub.gsub('+', ' ', query)
+	    decoded_query = string.replace(query, '+', ' ')
 	    try:
 		os.setuid(nobody)
 	    except os.error:
diff --git a/Lib/binhex.py b/Lib/binhex.py
@@ -76,7 +76,6 @@ def openrsrc(name, *mode):
 	#
 	# Glue code for non-macintosh useage
 	#
-	import regsub
 	
 	class FInfo:
 		def __init__(self):
@@ -99,7 +98,7 @@ def getfileinfo(name):
 		dsize = fp.tell()
 		fp.close()
 		dir, file = os.path.split(name)
-		file = regsub.sub(':', '-', file)
+		file = string.replace(file, ':', '-', 1)
 		return file, finfo, dsize, 0
 
 	class openrsrc:
diff --git a/Lib/cgi.py b/Lib/cgi.py
@@ -420,7 +420,6 @@
 import sys
 import os
 import urllib
-import regsub
 import mimetools
 import rfc822
 from StringIO import StringIO
@@ -564,8 +563,8 @@ def parse_qs(qs, keep_blank_values=0, strict_parsing=0):
 	    if strict_parsing:
 		raise ValueError, "bad query field: %s" % `name_value`
 	    continue
-	name = urllib.unquote(regsub.gsub('+', ' ', nv[0]))
-	value = urllib.unquote(regsub.gsub('+', ' ', nv[1]))
+	name = urllib.unquote(string.replace(nv[0], '+', ' '))
+	value = urllib.unquote(string.replace(nv[1], '+', ' '))
         if len(value) or keep_blank_values:
 	    if dict.has_key (name):
 		dict[name].append(value)
@@ -1317,11 +1316,11 @@ def print_environ_usage():
 
 def escape(s, quote=None):
     """Replace special characters '&', '<' and '>' by SGML entities."""
-    s = regsub.gsub("&", "&amp;", s)	# Must be done first!
-    s = regsub.gsub("<", "&lt;", s)
-    s = regsub.gsub(">", "&gt;", s)
+    s = string.replace(s, "&", "&amp;")	# Must be done first!
+    s = string.replace(s, "<", "&lt;")
+    s = string.replace(s, ">", "&gt;",)
     if quote:
-	s = regsub.gsub('"', "&quot;", s)
+	s = string.replace(s, '"', "&quot;")
     return s
 
 
diff --git a/Lib/mhlib.py b/Lib/mhlib.py
@@ -773,7 +773,7 @@ def getbody(self):
 # - the string used to initialize the set (default ''),
 # - the separator between ranges (default ',')
 # - the separator between begin and end of a range (default '-')
-# The separators may be regular expressions and should be different.
+# The separators must be strings (not regexprs) and should be different.
 #
 # The tostring() function yields a string that can be passed to another
 # IntSet constructor; __repr__() is a valid IntSet constructor itself.
@@ -882,11 +882,11 @@ def addpair(self, xlo, xhi):
 	self.normalize()
 
     def fromstring(self, data):
-	import string, regsub
+	import string
 	new = []
-	for part in regsub.split(data, self.sep):
+	for part in string.splitfields(data, self.sep):
 	    list = []
-	    for subp in regsub.split(part, self.rng):
+	    for subp in string.splitfields(part, self.rng):
 		s = string.strip(subp)
 		list.append(string.atoi(s))
 	    if len(list) == 1:
diff --git a/Lib/telnetlib.py b/Lib/telnetlib.py
@@ -38,7 +38,6 @@
 import socket
 import select
 import string
-import regsub
 
 # Tunable parameters
 DEBUGLEVEL = 0
@@ -185,7 +184,7 @@ def write(self, buffer):
 
 	"""
 	if IAC in buffer:
-	    buffer = regsub.gsub(IAC, IAC+IAC, buffer)
+	    buffer = string.replace(buffer, IAC, IAC+IAC)
 	self.sock.send(buffer)
 
     def read_until(self, match, timeout=None):

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ def openrsrc(name, *mode):`
`76`	`76`	`#`
`77`	`77`	`# Glue code for non-macintosh useage`
`78`	`78`	`#`
`79`		`- import regsub`
`80`	`79`
`81`	`80`	`class FInfo:`
`82`	`81`	`def __init__(self):`
`@@ -99,7 +98,7 @@ def getfileinfo(name):`
`99`	`98`	`dsize = fp.tell()`
`100`	`99`	`fp.close()`
`101`	`100`	`dir, file = os.path.split(name)`
`102`		`- file = regsub.sub(':', '-', file)`
	`101`	`+ file = string.replace(file, ':', '-', 1)`
`103`	`102`	`return file, finfo, dsize, 0`
`104`	`103`
`105`	`104`	`class openrsrc:`