diff options
author | Éric Araujo <merwok@netwok.org> | 2011-07-26 17:36:19 +0200 |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2011-07-26 17:36:19 +0200 |
commit | 89b5ad3d5fede793aaef0fcfecd91a7104b2b8b2 (patch) | |
tree | 60e02bc73a7c5cfe55448cbd2334d1eab423785b /Tools/scripts | |
parent | c73eb72c62824637a4be83b3dd5a2774a993d6ba (diff) | |
download | cpython-89b5ad3d5fede793aaef0fcfecd91a7104b2b8b2.tar.gz |
Fix string exception and a few style issues in mailerdaemon script
Diffstat (limited to 'Tools/scripts')
-rw-r--r--[-rwxr-xr-x] | Tools/scripts/mailerdaemon.py | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/Tools/scripts/mailerdaemon.py b/Tools/scripts/mailerdaemon.py index 4934b92eaa..62189f14e9 100755..100644 --- a/Tools/scripts/mailerdaemon.py +++ b/Tools/scripts/mailerdaemon.py @@ -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 re import os import sys -Unparseable = 'mailerdaemon.Unparseable' + +class Unparseable(Exception): + pass + class ErrorMessage(email.message.Message): def __init__(self): @@ -18,8 +21,10 @@ class ErrorMessage(email.message.Message): 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) |