Use string.replace instead of regsub.[g]sub.
This commit is contained in:
parent
b9b50eb7e0
commit
00f9fea288
|
@ -148,8 +148,7 @@ class CGIHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
|
|||
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:
|
||||
|
|
|
@ -76,7 +76,6 @@ else:
|
|||
#
|
||||
# Glue code for non-macintosh useage
|
||||
#
|
||||
import regsub
|
||||
|
||||
class FInfo:
|
||||
def __init__(self):
|
||||
|
@ -99,7 +98,7 @@ else:
|
|||
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:
|
||||
|
|
13
Lib/cgi.py
13
Lib/cgi.py
|
@ -420,7 +420,6 @@ import string
|
|||
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 @@ environment as well. Here are some common variable names:
|
|||
|
||||
def escape(s, quote=None):
|
||||
"""Replace special characters '&', '<' and '>' by SGML entities."""
|
||||
s = regsub.gsub("&", "&", s) # Must be done first!
|
||||
s = regsub.gsub("<", "<", s)
|
||||
s = regsub.gsub(">", ">", s)
|
||||
s = string.replace(s, "&", "&") # Must be done first!
|
||||
s = string.replace(s, "<", "<")
|
||||
s = string.replace(s, ">", ">",)
|
||||
if quote:
|
||||
s = regsub.gsub('"', """, s)
|
||||
s = string.replace(s, '"', """)
|
||||
return s
|
||||
|
||||
|
||||
|
|
|
@ -773,7 +773,7 @@ class SubMessage(Message):
|
|||
# - 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 @@ class IntSet:
|
|||
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:
|
||||
|
|
|
@ -38,7 +38,6 @@ To do:
|
|||
import socket
|
||||
import select
|
||||
import string
|
||||
import regsub
|
||||
|
||||
# Tunable parameters
|
||||
DEBUGLEVEL = 0
|
||||
|
@ -185,7 +184,7 @@ class Telnet:
|
|||
|
||||
"""
|
||||
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):
|
||||
|
|
Loading…
Reference in New Issue