fp.tell()
except (AttributeError, IOError):
seekable = 0
- else:
- seekable = 1
self.fp = fp
self.seekable = seekable
self.startofheaders = None
"""
self.dict = {}
self.unixfrom = ''
- self.headers = list = []
+ self.headers = lst = []
self.status = ''
headerseen = ""
firstline = 1
firstline = 0
if headerseen and line[0] in ' \t':
# It's a continuation line.
- list.append(line)
+ lst.append(line)
x = (self.dict[headerseen] + "\n " + line.strip())
self.dict[headerseen] = x.strip()
continue
headerseen = self.isheader(line)
if headerseen:
# It's a legal header line, save it.
- list.append(line)
+ lst.append(line)
self.dict[headerseen] = line[len(headerseen)+1:].strip()
continue
else:
i = line.find(':')
if i > 0:
return line[:i].lower()
- else:
- return None
+ return None
def islast(self, line):
"""Determine whether a line is a legal end of RFC 2822 headers.
"""
name = name.lower() + ':'
n = len(name)
- list = []
+ lst = []
hit = 0
for line in self.headers:
if line[:n].lower() == name:
elif not line[:1].isspace():
hit = 0
if hit:
- list.append(line)
- return list
+ lst.append(line)
+ return lst
def getfirstmatchingheader(self, name):
"""Get the first header line matching name.
"""
name = name.lower() + ':'
n = len(name)
- list = []
+ lst = []
hit = 0
for line in self.headers:
if hit:
elif line[:n].lower() == name:
hit = 1
if hit:
- list.append(line)
- return list
+ lst.append(line)
+ return lst
def getrawheader(self, name):
"""A higher-level interface to getfirstmatchingheader().
occur.
"""
- list = self.getfirstmatchingheader(name)
- if not list:
+ lst = self.getfirstmatchingheader(name)
+ if not lst:
return None
- list[0] = list[0][len(name) + 1:]
- return ''.join(list)
+ lst[0] = lst[0][len(name) + 1:]
+ return ''.join(lst)
def getheader(self, name, default=None):
"""Get the header value for a name.
header value for a given header name, or None if it doesn't exist.
This uses the dictionary version which finds the *last* such header.
"""
- try:
- return self.dict[name.lower()]
- except KeyError:
- return default
+ return self.dict.get(name.lower(), default)
get = getheader
def getheaders(self, name):
del self[name] # Won't fail if it doesn't exist
self.dict[name.lower()] = value
text = name + ": " + value
- lines = text.split("\n")
- for line in lines:
- self.headers.append(line + "\n")
+ self.headers.extend(text.splitlines(True))
+ self.headers.append('\n')
def __delitem__(self, name):
"""Delete all occurrences of a specific header, if it is present."""
del self.dict[name]
name = name + ':'
n = len(name)
- list = []
+ lst = []
hit = 0
for i in range(len(self.headers)):
line = self.headers[i]
elif not line[:1].isspace():
hit = 0
if hit:
- list.append(i)
- for i in reversed(list):
+ lst.append(i)
+ for i in reversed(lst):
del self.headers[i]
def setdefault(self, name, default=""):
return self.dict[lowername]
else:
text = name + ": " + default
- lines = text.split("\n")
- for line in lines:
- self.headers.append(line + "\n")
+ self.headers.extend(text.splitlines(True))
+ self.headers.append('\n')
self.dict[lowername] = default
return default
# XXX The inverses of the parse functions may also be useful.
-def unquote(str):
+def unquote(s):
"""Remove quotes from a string."""
- if len(str) > 1:
- if str.startswith('"') and str.endswith('"'):
- return str[1:-1].replace('\\\\', '\\').replace('\\"', '"')
- if str.startswith('<') and str.endswith('>'):
- return str[1:-1]
- return str
+ if len(s) > 1:
+ if s.startswith('"') and s.endswith('"'):
+ return s[1:-1].replace('\\\\', '\\').replace('\\"', '"')
+ if s.startswith('<') and s.endswith('>'):
+ return s[1:-1]
+ return s
-def quote(str):
+def quote(s):
"""Add quotes around a string."""
- return str.replace('\\', '\\\\').replace('"', '\\"')
+ return s.replace('\\', '\\\\').replace('"', '\\"')
def parseaddr(address):
"""Parse an address into a (realname, mailaddr) tuple."""
a = AddressList(address)
- list = a.addresslist
- if not list:
+ lst = a.addresslist
+ if not lst:
return (None, None)
- else:
- return list[0]
+ return lst[0]
class AddrlistClass:
Returns a list containing all of the addresses.
"""
result = []
- while 1:
+ ad = self.getaddress()
+ while ad:
+ result += ad
ad = self.getaddress()
- if ad:
- result += ad
- else:
- break
return result
def getaddress(self):
returnlist = []
fieldlen = len(self.field)
- self.pos = self.pos + 1
+ self.pos += 1
while self.pos < len(self.field):
self.gotonext()
if self.pos < fieldlen and self.field[self.pos] == ';':
- self.pos = self.pos + 1
+ self.pos += 1
break
returnlist = returnlist + self.getaddress()
if plist:
returnlist = [(' '.join(self.commentlist), plist[0])]
elif self.field[self.pos] in self.specials:
- self.pos = self.pos + 1
+ self.pos += 1
self.gotonext()
if self.pos < len(self.field) and self.field[self.pos] == ',':
- self.pos = self.pos + 1
+ self.pos += 1
return returnlist
def getrouteaddr(self):
return
expectroute = 0
- self.pos = self.pos + 1
+ self.pos += 1
self.gotonext()
adlist = ""
while self.pos < len(self.field):
self.getdomain()
expectroute = 0
elif self.field[self.pos] == '>':
- self.pos = self.pos + 1
+ self.pos += 1
break
elif self.field[self.pos] == '@':
- self.pos = self.pos + 1
+ self.pos += 1
expectroute = 1
elif self.field[self.pos] == ':':
- self.pos = self.pos + 1
+ self.pos += 1
else:
adlist = self.getaddrspec()
- self.pos = self.pos + 1
+ self.pos += 1
break
self.gotonext()
while self.pos < len(self.field):
if self.field[self.pos] == '.':
aslist.append('.')
- self.pos = self.pos + 1
+ self.pos += 1
elif self.field[self.pos] == '"':
aslist.append('"%s"' % self.getquote())
elif self.field[self.pos] in self.atomends:
return ''.join(aslist)
aslist.append('@')
- self.pos = self.pos + 1
+ self.pos += 1
self.gotonext()
return ''.join(aslist) + self.getdomain()
sdlist = []
while self.pos < len(self.field):
if self.field[self.pos] in self.LWS:
- self.pos = self.pos + 1
+ self.pos += 1
elif self.field[self.pos] == '(':
self.commentlist.append(self.getcomment())
elif self.field[self.pos] == '[':
sdlist.append(self.getdomainliteral())
elif self.field[self.pos] == '.':
- self.pos = self.pos + 1
+ self.pos += 1
sdlist.append('.')
elif self.field[self.pos] in self.atomends:
break
slist = ['']
quote = 0
- self.pos = self.pos + 1
+ self.pos += 1
while self.pos < len(self.field):
if quote == 1:
slist.append(self.field[self.pos])
quote = 0
elif self.field[self.pos] in endchars:
- self.pos = self.pos + 1
+ self.pos += 1
break
elif allowcomments and self.field[self.pos] == '(':
slist.append(self.getcomment())
quote = 1
else:
slist.append(self.field[self.pos])
- self.pos = self.pos + 1
+ self.pos += 1
return ''.join(slist)
if self.field[self.pos] in atomends:
break
else: atomlist.append(self.field[self.pos])
- self.pos = self.pos + 1
+ self.pos += 1
return ''.join(atomlist)
while self.pos < len(self.field):
if self.field[self.pos] in self.LWS:
- self.pos = self.pos + 1
+ self.pos += 1
elif self.field[self.pos] == '"':
plist.append(self.getquote())
elif self.field[self.pos] == '(':
else:
tzsign = 1
tzoffset = tzsign * ( (tzoffset//100)*3600 + (tzoffset % 100)*60)
- tuple = (yy, mm, dd, thh, tmm, tss, 0, 1, 0, tzoffset)
- return tuple
+ return (yy, mm, dd, thh, tmm, tss, 0, 1, 0, tzoffset)
def parsedate(data):
"""Convert a time string to a time tuple."""
t = parsedate_tz(data)
- if type(t) == type( () ):
- return t[:9]
- else: return t
+ if t is None:
+ return t
+ return t[:9]
def mktime_tz(data):
timeval = time.time()
timeval = time.gmtime(timeval)
return "%s, %02d %s %04d %02d:%02d:%02d GMT" % (
- ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"][timeval[6]],
+ ("Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun")[timeval[6]],
timeval[2],
- ["Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"][timeval[1]-1],
+ ("Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec")[timeval[1]-1],
timeval[0], timeval[3], timeval[4], timeval[5])
m.rewindbody()
n = 0
while f.readline():
- n = n + 1
+ n += 1
print 'Lines:', n
print '-'*70
print 'len =', len(m)
projects / python / commitdiff