Update of /cvsroot/mailman/mailman3/src/mailman/smtp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1878
Modified Files:
bounceproc.py
Log Message:
Fix some pychecker warnings and update some configuration object paths.
Index: bounceproc.py
===================================================================
RCS file: /cvsroot/mailman/mailman3/src/mailman/smtp/bounceproc.py,v
retrieving revision 3.0
retrieving revision 3.1
diff -u -d -r3.0 -r3.1
--- bounceproc.py 29 Mar 2004 05:18:52 -0000 3.0
+++ bounceproc.py 1 May 2004 18:35:40 -0000 3.1
@@ -42,7 +42,7 @@
def _open(self):
filename = 'bounces.%05d.%05d.open' % (os.getpid(), self._seqno)
self._seqno += 1
- path = os.path.join(configuration.dirs.bouncedata, filename)
+ path = os.path.join(configuration.layout.bouncedata, filename)
self._bouncefp = open(path, 'w')
self._count = 0
@@ -100,8 +100,8 @@
self._files = []
# First scan the event dir for existing .close files, and add them to
# the queue for processing.
- for f in os.listdir(configuration.dirs.bouncedata):
- path = os.path.join(configuration.dirs.bouncedata, f)
+ for f in os.listdir(configuration.layout.bouncedata):
+ path = os.path.join(configuration.layout.bouncedata, f)
if path.endswith('.closed'):
self._files.append(path)
@@ -119,18 +119,18 @@
def _work(self):
# Process one file at a time. If self._files is empty, flip the event
# log to get another file to work on.
- file = None
- while self._files and not file:
- file = self._takefile(self._files.pop())
- if file is None:
- file = self._takefile(self._bounceEvents.flip())
- if file is None:
+ path = None
+ while self._files and not path:
+ path = self._takefile(self._files.pop())
+ if path is None:
+ path = self._takefile(self._bounceEvents.flip())
+ if path is None:
# Nothing to do
return
# Now process all the events in the file. We only process one bounce
# per address per day.
s = sets.Set()
- fp = open(file)
+ fp = open(path)
try:
for line in fp:
address, date = line.split()
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
