Fix string exception and a few style issues in mailerdaemon script

This commit is contained in:
Éric Araujo 2011-07-26 17:36:19 +02:00
parent cab106cfca
commit 1ce7b17165
1 changed files with 16 additions and 8 deletions

View File

@ -1,4 +1,4 @@
"""mailerdaemon - classes to parse mailer-daemon messages"""
"""Classes to parse mailer-daemon messages."""
import calendar
import email.message
@ -6,7 +6,10 @@
import os
import sys
Unparseable = 'mailerdaemon.Unparseable'
class Unparseable(Exception):
pass
class ErrorMessage(email.message.Message):
def __init__(self):
@ -18,8 +21,10 @@ def is_warning(self):
if not sub:
return 0
sub = sub.lower()
if sub.startswith('waiting mail'): return 1
if 'warning' in sub: return 1
if sub.startswith('waiting mail'):
return 1
if 'warning' in sub:
return 1
self.sub = sub
return 0
@ -145,14 +150,17 @@ def emparse_list(fp, sub):
errors.append(' '.join((email.strip()+': '+reason).split()))
return errors
EMPARSERS = [emparse_list, ]
EMPARSERS = [emparse_list]
def sort_numeric(a, b):
a = int(a)
b = int(b)
if a < b: return -1
elif a > b: return 1
else: return 0
if a < b:
return -1
elif a > b:
return 1
else:
return 0
def parsedir(dir, modify):
os.chdir(dir)