[minion-cvs] Make pychecker happy

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria.mit.edu:/tmp/cvs-serv1444/lib/mixminion

Modified Files:
	ClientMain.py Filestore.py Packet.py 
Log Message:
Make pychecker happy

Index: ClientMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientMain.py,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- ClientMain.py	28 Aug 2003 08:53:31 -0000	1.110
+++ ClientMain.py	28 Aug 2003 18:43:44 -0000	1.111
@@ -502,7 +502,7 @@
         for s in servers:
             maxSize = s['Delivery/SMTP']['Maximum-Size'] * 1024
             maxPackets = s['Delivery/Fragmented'].get('Maximum-Fragments',1)
-            if maxSize >= size and maxPackets >= packets:
+            if maxSize >= size and maxPackets >= nPackets:
                 return s
 
         return None

Index: Filestore.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Filestore.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Filestore.py	25 Aug 2003 21:05:34 -0000	1.8
+++ Filestore.py	28 Aug 2003 18:43:44 -0000	1.9
@@ -470,7 +470,7 @@
         ObjectStoreMixin.__init__(self)
     def queueObject(self, object):
         LOG.warn("Called 'queueObject' on a metadata store.")
-        return self.queueObjectAndMetadata(message, None)
+        return self.queueObjectAndMetadata(object, None)
     def queueObjectAndMetadata(self, object, metadata):
         f, handle = self.openNewMessage()
         cPickle.dump(object, f, 1)

Index: Packet.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Packet.py,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- Packet.py	28 Aug 2003 01:40:08 -0000	1.58
+++ Packet.py	28 Aug 2003 18:43:44 -0000	1.59
@@ -767,7 +767,7 @@
     if subject:
         headers['SUBJECT'] = subject
     if fromAddr:
-        for badchar in '"[]:':
+        for badchar in ('"', '[', ']', ':'):
             if badchar in fromAddr:
                 raise MixError("Forbidden character %r in from address"%
                                badchar)