[minion-cvs] fixed some more of the tracebacks due to format strings

[arma@seul.org (Roger Dingledine)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria.mit.edu:/home/arma/work/minion/src/minion/lib/mixminion

Modified Files:
	Common.py Config.py Packet.py 
Log Message:
fixed some more of the tracebacks due to format strings

our Log approach still uses C-style format strings, which I think
will continue bringing us pain.


Index: Common.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Common.py,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- Common.py	13 Jun 2003 01:03:45 -0000	1.90
+++ Common.py	25 Jun 2003 17:03:10 -0000	1.91
@@ -304,7 +304,7 @@
         try:
             os.makedirs(d, 0700)
         except OSError, e:
-            raise MixFatalError("Unable to create directory %s: %s" % d, e)
+            raise MixFatalError("Unable to create directory %s: %s" % (d, e))
 
     checkPrivateDir(d)
 
@@ -641,7 +641,7 @@
             self.file = open(self.fname, 'a')
         except OSError, e:
             self.file = None
-            raise MixError("Unable to open log file %r: %s"%self.fname, e)
+            raise MixError("Unable to open log file %r: %s"%(self.fname, e))
     def close(self):
         "Close the underlying file"
         self.file.close()

Index: Config.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Config.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- Config.py	21 Jun 2003 21:47:50 -0000	1.48
+++ Config.py	25 Jun 2003 17:03:11 -0000	1.49
@@ -344,8 +344,8 @@
                    "0123456789_.@-")
 MAX_NICKNAME = 128
 def _parseNickname(s):
-    """Validation function.  Returns true iff s contains a valoid
-       server nickname-- that is, a string of 1..128 characters,
+    """Validation function.  Returns true iff s contains a valid
+       server nickname -- that is, a string of 1..128 characters,
        containing only the characters [A-Za-z0-9_@], '.' or '-'.
        """
     s = s.strip()

Index: Packet.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Packet.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- Packet.py	6 Jun 2003 06:04:57 -0000	1.46
+++ Packet.py	25 Jun 2003 17:03:11 -0000	1.47
@@ -418,8 +418,8 @@
         raise ParseError("Misformatted reply block")
 
     if major != 0x00 or minor != 0x01:
-        raise ParseError("Unrecognized version on reply block %s.%s",
-                         major,minor)
+        raise ParseError("Unrecognized version on reply block %s.%s"
+                         %(major,minor))
 
     ri = s[MIN_RB_LEN:]
     length = rlen + MIN_RB_LEN