Update of /cvsroot/mailman/mailman3/src/mailman/queues
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1385
Modified Files:
maildir.py
Log Message:
Fix some pychecker warnings and update some configuration object paths.
Index: maildir.py
===================================================================
RCS file: /cvsroot/mailman/mailman3/src/mailman/queues/maildir.py,v
retrieving revision 3.2
retrieving revision 3.3
diff -u -d -r3.2 -r3.3
--- maildir.py 20 Apr 2004 04:16:34 -0000 3.2
+++ maildir.py 1 May 2004 18:33:08 -0000 3.3
@@ -129,7 +129,7 @@
self._kids = {}
self._stop = False
self._parser = Parser(Message)
- self._maildir = os.path.join(configuration.dirs.qdir, 'maildir')
+ self._maildir = os.path.join(configuration.layout.qdir, 'maildir')
# We create a switchboard for this runner, but then throw it away. We
# just want the side effect of making sure the directory exists.
Switchboard(self._maildir)
@@ -152,10 +152,10 @@
if e.errno <> errno.ENOENT: raise
# Nothing's been delivered to this mailing list yet.
continue
- for file in files:
- srcname = os.path.join(new, file)
- dstname = os.path.join(cur, file + ':1,P')
- xdstname = os.path.join(cur, file + ':1,X')
+ for f in files:
+ srcname = os.path.join(new, f)
+ dstname = os.path.join(cur, f + ':1,P')
+ xdstname = os.path.join(cur, f + ':1,X')
try:
os.rename(srcname, dstname)
except OSError, e:
@@ -196,26 +196,26 @@
# switchboard for this message's queue.
msgdata = {'listname': listname}
if dest.command is None:
- dir = 'incoming'
+ qdir = 'incoming'
elif dest.command == 'bounces':
- dir = 'bounce'
+ qdir = 'bounce'
elif dest.command == 'confirm':
msgdata['toconfirm'] = True
- dir = 'command'
+ qdir = 'command'
elif dest.command in ('join', 'subscribe'):
msgdata['tojoin'] = True
- dir = 'command'
+ qdir = 'command'
elif dest.command in ('leave', 'unsubscribe'):
msgdata['toleave'] = True
- dir = 'command'
+ qdir = 'command'
elif dest.command == 'owner':
msgdata['toowner'] = True
- dir = 'incoming'
+ qdir = 'incoming'
elif dest.command == 'request':
msgdata['torequest'] = True
- dir = 'command'
+ qdir = 'command'
else:
raise errors.NoValidDestinationError
# Enqueue the message; we're done
- sb = Switchboard(os.path.join(configuration.dirs.qdir, dir))
- sb.enqueue(msg, metadata)
+ sb = Switchboard(os.path.join(configuration.layout.qdir, qdir))
+ sb.enqueue(msg, msgdata)
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
