Skip to content

Commit 1ce7b17

Browse files
committed
Fix string exception and a few style issues in mailerdaemon script
1 parent cab106c commit 1ce7b17

1 file changed

Lines changed: 16 additions & 8 deletions

File tree

‎Tools/scripts/mailerdaemon.py‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
"""mailerdaemon - classes to parse mailer-daemon messages"""
1+
"""Classes to parse mailer-daemon messages."""
22

33
import calendar
44
import email.message
55
import re
66
import os
77
import sys
88

9-
Unparseable = 'mailerdaemon.Unparseable'
9+
10+
class Unparseable(Exception):
11+
pass
12+
1013

1114
class ErrorMessage(email.message.Message):
1215
def __init__(self):
@@ -18,8 +21,10 @@ def is_warning(self):
1821
if not sub:
1922
return 0
2023
sub = sub.lower()
21-
if sub.startswith('waiting mail'): return 1
22-
if 'warning' in sub: return 1
24+
if sub.startswith('waiting mail'):
25+
return 1
26+
if 'warning' in sub:
27+
return 1
2328
self.sub = sub
2429
return 0
2530

@@ -145,14 +150,17 @@ def emparse_list(fp, sub):
145150
errors.append(' '.join((email.strip()+': '+reason).split()))
146151
return errors
147152

148-
EMPARSERS = [emparse_list, ]
153+
EMPARSERS = [emparse_list]
149154

150155
def sort_numeric(a, b):
151156
a = int(a)
152157
b = int(b)
153-
if a < b: return -1
154-
elif a > b: return 1
155-
else: return 0
158+
if a < b:
159+
return -1
160+
elif a > b:
161+
return 1
162+
else:
163+
return 0
156164

157165
def parsedir(dir, modify):
158166
os.chdir(dir)

0 commit comments

Comments
 (0)