mirror of
https://github.com/python/cpython.git
synced 2025-09-18 22:50:26 +00:00
Fix string exception and a few style issues in mailerdaemon script
This commit is contained in:
parent
cab106cfca
commit
1ce7b17165
1 changed files with 16 additions and 8 deletions
|
@ -1,4 +1,4 @@
|
||||||
"""mailerdaemon - classes to parse mailer-daemon messages"""
|
"""Classes to parse mailer-daemon messages."""
|
||||||
|
|
||||||
import calendar
|
import calendar
|
||||||
import email.message
|
import email.message
|
||||||
|
@ -6,7 +6,10 @@ import re
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
Unparseable = 'mailerdaemon.Unparseable'
|
|
||||||
|
class Unparseable(Exception):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
class ErrorMessage(email.message.Message):
|
class ErrorMessage(email.message.Message):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
@ -18,8 +21,10 @@ class ErrorMessage(email.message.Message):
|
||||||
if not sub:
|
if not sub:
|
||||||
return 0
|
return 0
|
||||||
sub = sub.lower()
|
sub = sub.lower()
|
||||||
if sub.startswith('waiting mail'): return 1
|
if sub.startswith('waiting mail'):
|
||||||
if 'warning' in sub: return 1
|
return 1
|
||||||
|
if 'warning' in sub:
|
||||||
|
return 1
|
||||||
self.sub = sub
|
self.sub = sub
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
@ -145,14 +150,17 @@ def emparse_list(fp, sub):
|
||||||
errors.append(' '.join((email.strip()+': '+reason).split()))
|
errors.append(' '.join((email.strip()+': '+reason).split()))
|
||||||
return errors
|
return errors
|
||||||
|
|
||||||
EMPARSERS = [emparse_list, ]
|
EMPARSERS = [emparse_list]
|
||||||
|
|
||||||
def sort_numeric(a, b):
|
def sort_numeric(a, b):
|
||||||
a = int(a)
|
a = int(a)
|
||||||
b = int(b)
|
b = int(b)
|
||||||
if a < b: return -1
|
if a < b:
|
||||||
elif a > b: return 1
|
return -1
|
||||||
else: return 0
|
elif a > b:
|
||||||
|
return 1
|
||||||
|
else:
|
||||||
|
return 0
|
||||||
|
|
||||||
def parsedir(dir, modify):
|
def parsedir(dir, modify):
|
||||||
os.chdir(dir)
|
os.chdir(dir)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue