[Nym3-commit] r472 - trunk/nymbaron/Server

[laurent at conuropsis.org]

Author: laurent
Date: 2006-03-13 19:39:35 +0100 (Mon, 13 Mar 2006)
New Revision: 472

Modified:
   trunk/nymbaron/Server/Main.py
Log:
Remove extraneous parenthesis around a condition.
Commas are followed by whitespace. This rule has no exception.


Modified: trunk/nymbaron/Server/Main.py
===================================================================
--- trunk/nymbaron/Server/Main.py	2006-03-13 18:33:02 UTC (rev 471)
+++ trunk/nymbaron/Server/Main.py	2006-03-13 18:39:35 UTC (rev 472)
@@ -226,7 +226,7 @@
             except User.NoSuchUser:
                 logger.debug("No such user %s" % h.nym)
                 sys.exit(73) #TODO is it the smart error code
-            if(not nymUser.checkMessageSign(msg[Message.sigLength:],h.sig)):
+            if not nymUser.checkMessageSign(msg[Message.sigLength:], h.sig):
                 return
             #The message comes from a known nick and is authenticated
             #register the seqNo as received
@@ -252,7 +252,7 @@
                         else:
                             nymUser.addSurbs(com.surbs)
                     elif (com.ct() == Message.CToSCODE['Newpk']):
-                        nymUser.setKeys(com.kid,com.kenc)
+                        nymUser.setKeys(com.kid, com.kenc)
                     elif (com.ct() == Message.CToSCODE['Relay']):
 #                        ec = Mail.relay(h.nym, com.rt, com.ri,
 #                                        config.serverName, com.body)
@@ -280,16 +280,16 @@
                         for m in com.l:
                             if nymUser.hasMail(m):
                                 msgCom = Message.Msg()
-                                msgCom.fromData(m,nymUser.getMail(m))
+                                msgCom.fromData(m, nymUser.getMail(m))
                                 msgList.append(msgCom)
                                 sendList.append(m)
                         ec = nymUser.advanced_send(
                                 Message.buildMessage(msgList))
                         logger.debug("EC is " + str(ec))
                         if (ec == 0):
-                            nymUser.markMid(sendList,lifeCycle['sent-in-full'])
+                            nymUser.markMid(sendList, lifeCycle['sent-in-full'])
                             if(nymUser['HoldUntilAck'] == 'never'):
-                                map(nymUser.delete_msg,sendList)
+                                map(nymUser.delete_msg, sendList)
                             
                         else:
                             logger.error("mixminion exited abnormally with error code %d" % ec)