Update of /cvsroot/tmda/tmda/TMDA
In directory sc8-pr-cvs1:/tmp/cvs-serv31254
Modified Files:
Errors.py Pending.py
Log Message:
Moved error classes from Pending.py into Errors.py and subclassed them off of
TMDAError.
Index: Errors.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Errors.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Errors.py 26 Nov 2002 01:05:06 -0000 1.7
+++ Errors.py 6 Dec 2002 20:32:38 -0000 1.8
@@ -58,3 +58,12 @@
"""Expired 'dated' address."""
pass
+class QueueError(TMDAError):
+ def __init__(self, errmsg = 'Unknown error'):
+ self.args = errmsg
+
+ def __repr__(self):
+ return '%s:\n%s' % (self.__class__, self.args)
+
+class MessageError(QueueError):
+ pass
Index: Pending.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Pending.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Pending.py 5 Dec 2002 23:37:56 -0000 1.7
+++ Pending.py 6 Dec 2002 20:32:39 -0000 1.8
@@ -34,17 +34,6 @@
import Defaults
import Util
-class QueueError:
- errorMessage = ''
- def __init__(self, msg = 'Unknown error'):
- self.errorMessage = msg
-
- def __repr__(self):
- return '%s:\n%s' % (self.__class__, self.errorMessage)
-
-class MessageError(QueueError):
- pass
-
class Queue:
"""A simple pending queue."""
@@ -83,7 +72,7 @@
"""Initialize the queue with the given parameters (see __init__)."""
self.pendingdir = os.path.join(Defaults.DATADIR, 'pending')
if not os.path.exists(self.pendingdir):
- raise QueueError, QueueError('Pending directory %s does not exist,
exiting.' % self.pendingdir)
+ raise Errors.QueueError, 'Pending directory %s does not exist, exiting.'
+% self.pendingdir
# Replace any `-' in the message list with those messages provided
# via standard input. (Since it's pointless to call it twice,
@@ -258,7 +247,7 @@
self.count = self.count + 1
try:
M = Message(msgid, self.command_recipient)
- except MessageError, obj:
+ except Errors.MessageError, obj:
self.cPrint(obj)
continue
@@ -387,7 +376,7 @@
self.msgid = msgid
self.msgfile = os.path.join(Defaults.DATADIR, 'pending', self.msgid)
if not os.path.exists(self.msgfile):
- raise MessageError, MessageError('%s not found!' % self.msgid)
+ raise Errors.MessageError, '%s not found!' % self.msgid
self.msgobj = email.message_from_file(open(self.msgfile, 'r'))
self.return_path = email.Utils.parseaddr(
_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs
