traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of string functions. References to string.whitespace, 

string.digits are left.
This commit is contained in:
Guido van Rossum 2000-12-15 15:37:48 +00:00
parent 34735a6682
commit c80f182dc4
1 changed files with 57 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
Lib/rfc822.py
View File

@ -142,15 +142,15 @@ class Message:
self.status = 'EOF in headers' self.status = 'EOF in headers'
break break
# Skip unix From name time lines # Skip unix From name time lines
if firstline and line[:5] == 'From ': if firstline and line.startswith('From '):
self.unixfrom = self.unixfrom + line self.unixfrom = self.unixfrom + line
continue continue
firstline = 0 firstline = 0
if headerseen and line[0] in ' \t': if headerseen and line[0] in ' \t':
# It's a continuation line. # It's a continuation line.
list.append(line) list.append(line)
x = (self.dict[headerseen] + "\n " + string.strip(line)) x = (self.dict[headerseen] + "\n " + line.strip())
self.dict[headerseen] = string.strip(x) self.dict[headerseen] = x.strip()
continue continue
elif self.iscomment(line): elif self.iscomment(line):
# It's a comment. Ignore it. # It's a comment. Ignore it.
@ -162,7 +162,7 @@ class Message:
if headerseen: if headerseen:
# It's a legal header line, save it. # It's a legal header line, save it.
list.append(line) list.append(line)
self.dict[headerseen] = string.strip(line[len(headerseen)+1:]) self.dict[headerseen] = line[len(headerseen)+1:].strip()
continue continue
else: else:
# It's not a header line; throw it back and stop here. # It's not a header line; throw it back and stop here.
@ -186,9 +186,9 @@ class Message:
You may override this method in order to use Message parsing You may override this method in order to use Message parsing
on tagged data in RFC822-like formats with special header formats. on tagged data in RFC822-like formats with special header formats.
""" """
i = string.find(line, ':') i = line.find(':')
if i > 0: if i > 0:
return string.lower(line[:i]) return line[:i].lower()
else: else:
return None return None
@ -223,12 +223,12 @@ class Message:
times, all occurrences are returned. Case is not times, all occurrences are returned. Case is not
important in the header name. important in the header name.
""" """
name = string.lower(name) + ':' name = name.lower() + ':'
n = len(name) n = len(name)
list = [] list = []
hit = 0 hit = 0
for line in self.headers: for line in self.headers:
if string.lower(line[:n]) == name: if line[:n].lower() == name:
hit = 1 hit = 1
elif line[:1] not in string.whitespace: elif line[:1] not in string.whitespace:
hit = 0 hit = 0
@ -243,7 +243,7 @@ class Message:
only the first matching header (and its continuation only the first matching header (and its continuation
lines). lines).
""" """
name = string.lower(name) + ':' name = name.lower() + ':'
n = len(name) n = len(name)
list = [] list = []
hit = 0 hit = 0
@ -251,7 +251,7 @@ class Message:
if hit: if hit:
if line[:1] not in string.whitespace: if line[:1] not in string.whitespace:
break break
elif string.lower(line[:n]) == name: elif line[:n].lower() == name:
hit = 1 hit = 1
if hit: if hit:
list.append(line) list.append(line)
@ -271,7 +271,7 @@ class Message:
if not list: if not list:
return None return None
list[0] = list[0][len(name) + 1:] list[0] = list[0][len(name) + 1:]
return string.joinfields(list, '') return ''.join(list)
def getheader(self, name, default=None): def getheader(self, name, default=None):
"""Get the header value for a name. """Get the header value for a name.
@ -282,7 +282,7 @@ class Message:
version which finds the *last* such header. version which finds the *last* such header.
""" """
try: try:
return self.dict[string.lower(name)] return self.dict[name.lower()]
except KeyError: except KeyError:
return default return default
get = getheader get = getheader
@ -301,13 +301,13 @@ class Message:
for s in self.getallmatchingheaders(name): for s in self.getallmatchingheaders(name):
if s[0] in string.whitespace: if s[0] in string.whitespace:
if current: if current:
current = "%s\n %s" % (current, string.strip(s)) current = "%s\n %s" % (current, s.strip())
else: else:
current = string.strip(s) current = s.strip()
else: else:
if have_header: if have_header:
result.append(current) result.append(current)
current = string.strip(s[string.find(s, ":") + 1:]) current = s[s.find(":") + 1:].strip()
have_header = 1 have_header = 1
if have_header: if have_header:
result.append(current) result.append(current)
@ -341,11 +341,11 @@ class Message:
else: else:
if raw: if raw:
raw.append(', ') raw.append(', ')
i = string.find(h, ':') i = h.find(':')
if i > 0: if i > 0:
addr = h[i+1:] addr = h[i+1:]
raw.append(addr) raw.append(addr)
alladdrs = string.join(raw, '') alladdrs = ''.join(raw)
a = AddrlistClass(alladdrs) a = AddrlistClass(alladdrs)
return a.getaddrlist() return a.getaddrlist()
@ -383,7 +383,7 @@ class Message:
def __getitem__(self, name): def __getitem__(self, name):
"""Get a specific header, as from a dictionary.""" """Get a specific header, as from a dictionary."""
return self.dict[string.lower(name)] return self.dict[name.lower()]
def __setitem__(self, name, value): def __setitem__(self, name, value):
"""Set the value of a header. """Set the value of a header.
@ -393,15 +393,15 @@ class Message:
rather than where the altered header was. rather than where the altered header was.
""" """
del self[name] # Won't fail if it doesn't exist del self[name] # Won't fail if it doesn't exist
self.dict[string.lower(name)] = value self.dict[name.lower()] = value
text = name + ": " + value text = name + ": " + value
lines = string.split(text, "\n") lines = text.split("\n")
for line in lines: for line in lines:
self.headers.append(line + "\n") self.headers.append(line + "\n")
def __delitem__(self, name): def __delitem__(self, name):
"""Delete all occurrences of a specific header, if it is present.""" """Delete all occurrences of a specific header, if it is present."""
name = string.lower(name) name = name.lower()
if not self.dict.has_key(name): if not self.dict.has_key(name):
return return
del self.dict[name] del self.dict[name]
@ -411,7 +411,7 @@ class Message:
hit = 0 hit = 0
for i in range(len(self.headers)): for i in range(len(self.headers)):
line = self.headers[i] line = self.headers[i]
if string.lower(line[:n]) == name: if line[:n].lower() == name:
hit = 1 hit = 1
elif line[:1] not in string.whitespace: elif line[:1] not in string.whitespace:
hit = 0 hit = 0
@ -423,7 +423,7 @@ class Message:
def has_key(self, name): def has_key(self, name):
"""Determine whether a message contains the named header.""" """Determine whether a message contains the named header."""
return self.dict.has_key(string.lower(name)) return self.dict.has_key(name.lower())
def keys(self): def keys(self):
"""Get all of a message's header field names.""" """Get all of a message's header field names."""
@ -466,13 +466,7 @@ def unquote(str):
def quote(str): def quote(str):
"""Add quotes around a string.""" """Add quotes around a string."""
return '"%s"' % string.join( return str.replace('\\', '\\\\').replace('"', '\\"')
string.split(
string.join(
string.split(str, '\\'),
'\\\\'),
'"'),
'\\"')
def parseaddr(address): def parseaddr(address):
@ -543,7 +537,7 @@ class AddrlistClass:
if self.pos >= len(self.field): if self.pos >= len(self.field):
# Bad email address technically, no domain. # Bad email address technically, no domain.
if plist: if plist:
returnlist = [(string.join(self.commentlist), plist[0])] returnlist = [(' '.join(self.commentlist), plist[0])]
elif self.field[self.pos] in '.@': elif self.field[self.pos] in '.@':
# email address is just an addrspec # email address is just an addrspec
@ -551,7 +545,7 @@ class AddrlistClass:
self.pos = oldpos self.pos = oldpos
self.commentlist = oldcl self.commentlist = oldcl
addrspec = self.getaddrspec() addrspec = self.getaddrspec()
returnlist = [(string.join(self.commentlist), addrspec)] returnlist = [(' '.join(self.commentlist), addrspec)]
elif self.field[self.pos] == ':': elif self.field[self.pos] == ':':
# address is a group # address is a group
@ -571,13 +565,13 @@ class AddrlistClass:
routeaddr = self.getrouteaddr() routeaddr = self.getrouteaddr()
if self.commentlist: if self.commentlist:
returnlist = [(string.join(plist) + ' (' + \ returnlist = [(' '.join(plist) + ' (' + \
string.join(self.commentlist) + ')', routeaddr)] ' '.join(self.commentlist) + ')', routeaddr)]
else: returnlist = [(string.join(plist), routeaddr)] else: returnlist = [(' '.join(plist), routeaddr)]
else: else:
if plist: if plist:
returnlist = [(string.join(self.commentlist), plist[0])] returnlist = [(' '.join(self.commentlist), plist[0])]
elif self.field[self.pos] in self.specials: elif self.field[self.pos] in self.specials:
self.pos = self.pos + 1 self.pos = self.pos + 1
@ -636,12 +630,12 @@ class AddrlistClass:
self.gotonext() self.gotonext()
if self.pos >= len(self.field) or self.field[self.pos] != '@': if self.pos >= len(self.field) or self.field[self.pos] != '@':
return string.join(aslist, '') return ''.join(aslist)
aslist.append('@') aslist.append('@')
self.pos = self.pos + 1 self.pos = self.pos + 1
self.gotonext() self.gotonext()
return string.join(aslist, '') + self.getdomain() return ''.join(aslist) + self.getdomain()
def getdomain(self): def getdomain(self):
"""Get the complete domain name from an address.""" """Get the complete domain name from an address."""
@ -659,7 +653,7 @@ class AddrlistClass:
elif self.field[self.pos] in self.atomends: elif self.field[self.pos] in self.atomends:
break break
else: sdlist.append(self.getatom()) else: sdlist.append(self.getatom())
return string.join(sdlist, '') return ''.join(sdlist)
def getdelimited(self, beginchar, endchars, allowcomments = 1): def getdelimited(self, beginchar, endchars, allowcomments = 1):
"""Parse a header fragment delimited by special characters. """Parse a header fragment delimited by special characters.
@ -695,7 +689,7 @@ class AddrlistClass:
slist.append(self.field[self.pos]) slist.append(self.field[self.pos])
self.pos = self.pos + 1 self.pos = self.pos + 1
return string.join(slist, '') return ''.join(slist)
def getquote(self): def getquote(self):
"""Get a quote-delimited fragment from self's field.""" """Get a quote-delimited fragment from self's field."""
@ -719,7 +713,7 @@ class AddrlistClass:
else: atomlist.append(self.field[self.pos]) else: atomlist.append(self.field[self.pos])
self.pos = self.pos + 1 self.pos = self.pos + 1
return string.join(atomlist, '') return ''.join(atomlist)
def getphraselist(self): def getphraselist(self):
"""Parse a sequence of RFC-822 phrases. """Parse a sequence of RFC-822 phrases.
@ -756,7 +750,7 @@ class AddressList(AddrlistClass):
return len(self.addresslist) return len(self.addresslist)
def __str__(self): def __str__(self):
return string.joinfields(map(dump_address_pair, self.addresslist),", ") return ", ".join(map(dump_address_pair, self.addresslist))
def __add__(self, other): def __add__(self, other):
# Set union # Set union
@ -828,17 +822,17 @@ def parsedate_tz(data):
Accounts for military timezones. Accounts for military timezones.
""" """
data = string.split(data) data = data.split()
if data[0][-1] in (',', '.') or string.lower(data[0]) in _daynames: if data[0][-1] in (',', '.') or data[0].lower() in _daynames:
# There's a dayname here. Skip it # There's a dayname here. Skip it
del data[0] del data[0]
if len(data) == 3: # RFC 850 date, deprecated if len(data) == 3: # RFC 850 date, deprecated
stuff = string.split(data[0], '-') stuff = data[0].split('-')
if len(stuff) == 3: if len(stuff) == 3:
data = stuff + data[1:] data = stuff + data[1:]
if len(data) == 4: if len(data) == 4:
s = data[3] s = data[3]
i = string.find(s, '+') i = s.find('+')
if i > 0: if i > 0:
data[3:] = [s[:i], s[i+1:]] data[3:] = [s[:i], s[i+1:]]
else: else:
@ -847,16 +841,16 @@ def parsedate_tz(data):
return None return None
data = data[:5] data = data[:5]
[dd, mm, yy, tm, tz] = data [dd, mm, yy, tm, tz] = data
mm = string.lower(mm) mm = mm.lower()
if not mm in _monthnames: if not mm in _monthnames:
dd, mm = mm, string.lower(dd) dd, mm = mm, dd.lower()
if not mm in _monthnames: if not mm in _monthnames:
return None return None
mm = _monthnames.index(mm)+1 mm = _monthnames.index(mm)+1
if mm > 12: mm = mm - 12 if mm > 12: mm = mm - 12
if dd[-1] == ',': if dd[-1] == ',':
dd = dd[:-1] dd = dd[:-1]
i = string.find(yy, ':') i = yy.find(':')
if i > 0: if i > 0:
yy, tm = tm, yy yy, tm = tm, yy
if yy[-1] == ',': if yy[-1] == ',':
@ -865,7 +859,7 @@ def parsedate_tz(data):
yy, tz = tz, yy yy, tz = tz, yy
if tm[-1] == ',': if tm[-1] == ',':
tm = tm[:-1] tm = tm[:-1]
tm = string.splitfields(tm, ':') tm = tm.split(':')
if len(tm) == 2: if len(tm) == 2:
[thh, tmm] = tm [thh, tmm] = tm
tss = '0' tss = '0'
@ -874,21 +868,21 @@ def parsedate_tz(data):
else: else:
return None return None
try: try:
yy = string.atoi(yy) yy = int(yy)
dd = string.atoi(dd) dd = int(dd)
thh = string.atoi(thh) thh = int(thh)
tmm = string.atoi(tmm) tmm = int(tmm)
tss = string.atoi(tss) tss = int(tss)
except string.atoi_error: except ValueError:
return None return None
tzoffset=None tzoffset = None
tz=string.upper(tz) tz = tz.upper()
if _timezones.has_key(tz): if _timezones.has_key(tz):
tzoffset=_timezones[tz] tzoffset = _timezones[tz]
else: else:
try: try:
tzoffset=string.atoi(tz) tzoffset = int(tz)
except string.atoi_error: except ValueError:
pass pass
# Convert a timezone offset into seconds ; -0500 -> -18000 # Convert a timezone offset into seconds ; -0500 -> -18000
if tzoffset: if tzoffset:
@ -904,8 +898,8 @@ def parsedate_tz(data):
def parsedate(data): def parsedate(data):
"""Convert a time string to a time tuple.""" """Convert a time string to a time tuple."""
t=parsedate_tz(data) t = parsedate_tz(data)
if type(t)==type( () ): if type(t) == type( () ):
return t[:9] return t[:9]
else: return t else: return t