Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 14:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Guido van Rossum 1997-12-24 21:18:41 +00:00
parent b9b50eb7e0
commit 00f9fea288
5 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/CGIHTTPServer.py
View file

@ -148,8 +148,7 @@ def run_cgi(self):
if ua: if ua:
env['HTTP_USER_AGENT'] = ua env['HTTP_USER_AGENT'] = ua
# XXX Other HTTP_* headers # XXX Other HTTP_* headers
import regsub decoded_query = string.replace(query, '+', ' ')
decoded_query = regsub.gsub('+', ' ', query)
try: try:
os.setuid(nobody) os.setuid(nobody)
except os.error: except os.error:

3
Lib/binhex.py
View file

@ -76,7 +76,6 @@ def openrsrc(name, *mode):
# #
# Glue code for non-macintosh useage # Glue code for non-macintosh useage
# #
import regsub
class FInfo: class FInfo:
def __init__(self): def __init__(self):
@ -99,7 +98,7 @@ def getfileinfo(name):
dsize = fp.tell() dsize = fp.tell()
fp.close() fp.close()
dir, file = os.path.split(name) dir, file = os.path.split(name)
file = regsub.sub(':', '-', file) file = string.replace(file, ':', '-', 1)
return file, finfo, dsize, 0 return file, finfo, dsize, 0
class openrsrc: class openrsrc:

13
Lib/cgi.py
View file

@ -420,7 +420,6 @@
import sys import sys
import os import os
import urllib import urllib
import regsub
import mimetools import mimetools
import rfc822 import rfc822
from StringIO import StringIO from StringIO import StringIO
@ -564,8 +563,8 @@ def parse_qs(qs, keep_blank_values=0, strict_parsing=0):
if strict_parsing: if strict_parsing:
raise ValueError, "bad query field: %s" % `name_value` raise ValueError, "bad query field: %s" % `name_value`
continue continue
name = urllib.unquote(regsub.gsub('+', ' ', nv[0])) name = urllib.unquote(string.replace(nv[0], '+', ' '))
value = urllib.unquote(regsub.gsub('+', ' ', nv[1])) value = urllib.unquote(string.replace(nv[1], '+', ' '))
if len(value) or keep_blank_values: if len(value) or keep_blank_values:
if dict.has_key (name): if dict.has_key (name):
dict[name].append(value) dict[name].append(value)
@ -1317,11 +1316,11 @@ def print_environ_usage():
def escape(s, quote=None): def escape(s, quote=None):
"""Replace special characters '&', '<' and '>' by SGML entities.""" """Replace special characters '&', '<' and '>' by SGML entities."""
s = regsub.gsub("&", "&amp;", s) # Must be done first! s = string.replace(s, "&", "&amp;") # Must be done first!
s = regsub.gsub("<", "&lt;", s) s = string.replace(s, "<", "&lt;")
s = regsub.gsub(">", "&gt;", s) s = string.replace(s, ">", "&gt;",)
if quote: if quote:
s = regsub.gsub('"', "&quot;", s) s = string.replace(s, '"', "&quot;")
return s return s

8
Lib/mhlib.py
View file

@ -773,7 +773,7 @@ def getbody(self):
# - the string used to initialize the set (default ''), # - the string used to initialize the set (default ''),
# - the separator between ranges (default ',') # - the separator between ranges (default ',')
# - the separator between begin and end of a range (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 # The tostring() function yields a string that can be passed to another
# IntSet constructor; __repr__() is a valid IntSet constructor itself. # IntSet constructor; __repr__() is a valid IntSet constructor itself.
@ -882,11 +882,11 @@ def addpair(self, xlo, xhi):
self.normalize() self.normalize()
def fromstring(self, data): def fromstring(self, data):
import string, regsub import string
new = [] new = []
for part in regsub.split(data, self.sep): for part in string.splitfields(data, self.sep):
list = [] list = []
for subp in regsub.split(part, self.rng): for subp in string.splitfields(part, self.rng):
s = string.strip(subp) s = string.strip(subp)
list.append(string.atoi(s)) list.append(string.atoi(s))
if len(list) == 1: if len(list) == 1:

3
Lib/telnetlib.py
View file

@ -38,7 +38,6 @@
import socket import socket
import select import select
import string import string
import regsub
# Tunable parameters # Tunable parameters
DEBUGLEVEL = 0 DEBUGLEVEL = 0
@ -185,7 +184,7 @@ def write(self, buffer):
""" """
if IAC in buffer: if IAC in buffer:
buffer = regsub.gsub(IAC, IAC+IAC, buffer) buffer = string.replace(buffer, IAC, IAC+IAC)
self.sock.send(buffer) self.sock.send(buffer)
def read_until(self, match, timeout=None): def read_until(self, match, timeout=None):