[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[minion-cvs] Normalize whitespace
Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria.mit.edu:/tmp/cvs-serv27991/lib/mixminion
Modified Files:
ClientMain.py Common.py Config.py MMTPClient.py Main.py
Packet.py ServerInfo.py test.py
Log Message:
Normalize whitespace
Index: ClientMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientMain.py,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- ClientMain.py 20 Feb 2003 00:34:35 -0000 1.65
+++ ClientMain.py 20 Feb 2003 16:57:38 -0000 1.66
@@ -56,7 +56,7 @@
_CLIENT_LOCKFILE.acquire(blocking=1, contents=pidStr)
def clientUnlock():
- """Release the client lock."""
+ """Release the client lock."""
_CLIENT_LOCKFILE.release()
def configureClientLock(filename):
@@ -1189,7 +1189,7 @@
## Format:
# The directory holds files with names of the form pkt_<handle>.
# Each file holds pickled tuple containing:
- # ("PACKET-0",
+ # ("PACKET-0",
# a 32K string (the packet),
# an instance of IPV4Info (the first hop),
# the latest midnight preceeding the time when this
@@ -1310,7 +1310,7 @@
"""Generate and send a forward message.
address -- the results of a parseAddress call
payload -- the contents of the message to send
- servers1,servers2 -- lists of ServerInfos for the first and second
+ servers1,servers2 -- lists of ServerInfos for the first and second
legs the path, respectively.
forcePool -- if true, do not try to send the message; simply
pool it and exit.
@@ -1442,7 +1442,7 @@
else:
timeout = 60
- if noPool or lazyPool:
+ if noPool or lazyPool:
handles = []
else:
handles = self.poolMessages(msgList, routingInfo)
@@ -1503,7 +1503,7 @@
LOG.info("Sending %s messages to %s:%s...",
len(messagesByServer[routing]), routing.ip, routing.port)
msgs = [ m for m, _ in messagesByServer[routing] ]
- handles = [ h for _, h in messagesByServer[routing] ]
+ handles = [ h for _, h in messagesByServer[routing] ]
try:
self.sendMessages(msgs, routing, noPool=1, warnIfLost=0)
try:
@@ -1543,7 +1543,7 @@
return a list containing the decoded messages.
Raise ParseError on malformatted messages. Unless 'force' is
- true, do not uncompress possible zlib bombs.
+ true, do not uncompress possible zlib bombs.
"""
#XXXX004 write unit tests
results = []
@@ -1665,7 +1665,7 @@
-h | --help : print usage and exit.
-f | --config : specify a configuration file.
-v | --verbose : run verbosely.
- DIRECTORY ONLY
+ DIRECTORY ONLY
-D | --download-directory : force/disable directory downloading.
PATH-RELEATED
-t | --to : specify an exit address
@@ -1673,7 +1673,7 @@
--swap-at : specify a swap point numerically
-H | --hops : specify a path length
-P | --path : specify a literal path.
- REPLY PATH ONLY
+ REPLY PATH ONLY
--lifetime : Required lifetime of new reply blocks.
MESSAGE-SENDING ONLY:
--pool | --no-pool : force/disable pooling.
@@ -1726,7 +1726,7 @@
path (for forward or reply messages), and enable self.parsePath.
wantReplyPath -- If true, accept options to specify a path for
a reply block, and enable seslf.parsePath.
- minHops -- Smallest allowable value for -H option.
+ minHops -- Smallest allowable value for -H option.
"""
self.config = None
self.directory = None
@@ -2003,7 +2003,7 @@
%(cmd)s -t user@domain -i data -P 'Foo,Bar,Baz,Quux,Fee,Fie,Foe'
Specify an explicit path with a swap point
%(cmd)s -t user@domain -i data -P 'Foo,Bar,Baz,Quux:Fee,Fie,Foe'
- %(Send)s the message to a reply block stored in 'FredsBlocks', using a
+ %(Send)s the message to a reply block stored in 'FredsBlocks', using a
randomly chosen first leg.
%(cmd)s -t user@domain -i data -R FredsBlocks
%(Send)s the message to a reply block stored in 'FredsBlocks', specifying
@@ -2224,7 +2224,7 @@
wantLog=1)
except UsageError, e:
e.dump()
- print _UPDATE_SERVERS_USAGE % { 'cmd' : cmd }
+ print _UPDATE_SERVERS_USAGE % { 'cmd' : cmd }
sys.exit(1)
parser.init()
@@ -2246,7 +2246,7 @@
-F, --force: Decode the input files, even if they seem
overcompressed.
-o <file>, --output=<file> Write the results to <file> rather than stdout.
- -i <file>, --input=<file> Read the results from <file>.
+ -i <file>, --input=<file> Read the results from <file>.
EXAMPLES:
Decode message(s) stored in 'NewMail', writing the result to stdout.
Index: Common.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Common.py,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- Common.py 20 Feb 2003 01:54:44 -0000 1.65
+++ Common.py 20 Feb 2003 16:57:39 -0000 1.66
@@ -584,7 +584,7 @@
def __init__(self, name, severity):
self.name = name
self.severity = severity
- self.buf = []
+ self.buf = []
def write(self, s):
# This is inefficient, but we don't actually use this class if we can
# avoid it. The basic idea is to generate a call to Log.log for every
Index: Config.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Config.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Config.py 9 Feb 2003 22:30:58 -0000 1.39
+++ Config.py 20 Feb 2003 16:57:39 -0000 1.40
@@ -499,7 +499,7 @@
_syntax = None
_restrictFormat = 0
- _restrictKeys = 1
+ _restrictKeys = 1
def __init__(self, filename=None, string=None, assumeValid=0):
"""Create a new _ConfigFile. If <filename> is set, read from
Index: MMTPClient.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/MMTPClient.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- MMTPClient.py 13 Feb 2003 06:30:22 -0000 1.23
+++ MMTPClient.py 20 Feb 2003 16:57:39 -0000 1.24
@@ -135,7 +135,7 @@
# This is ugly, but we have no choice if we want to read up to the
# first newline.
# we don't really want 100; we just want up to the newline.
- inp = self.tls.read(100)
+ inp = self.tls.read(100)
while "\n" not in inp and len(inp) < 100:
inp += self.tls.read(100)
self.protocol = None
Index: Main.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Main.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Main.py 19 Feb 2003 03:41:22 -0000 1.35
+++ Main.py 20 Feb 2003 16:57:39 -0000 1.36
@@ -135,7 +135,7 @@
# obsolete; use server-reload #XXXX004 remove.
"reload-server" : ( 'mixminion.server.ServerMain', 'signalServer' ),
"server-stop" : ( 'mixminion.server.ServerMain', 'signalServer' ),
- "server-reload" : ( 'mixminion.server.ServerMain', 'signalServer' ),
+ "server-reload" : ( 'mixminion.server.ServerMain', 'signalServer' ),
"server-keygen" : ( 'mixminion.server.ServerMain', 'runKeygen'),
"server-DELKEYS" : ( 'mixminion.server.ServerMain', 'removeKeys'),
"dir": ( 'mixminion.directory.DirMain', 'main'),
Index: Packet.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Packet.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- Packet.py 20 Feb 2003 02:20:33 -0000 1.37
+++ Packet.py 20 Feb 2003 16:57:39 -0000 1.38
@@ -407,7 +407,7 @@
# XXXX Use a better pattern here.
RB_TEXT_RE = re.compile(r"==+ BEGIN TYPE III REPLY BLOCK ==+"+
r'[\r\n]+Version: (\d+\.\d+)\s*[\r\n]+(.*?)'+
- r"==+ END TYPE III REPLY BLOCK ==+", re.M|re.DOTALL)
+ r"==+ END TYPE III REPLY BLOCK ==+", re.M|re.DOTALL)
def parseTextReplyBlocks(s):
"""Given a string holding one or more text-encoded reply blocks,
@@ -662,11 +662,11 @@
msgType = 'TXT'
elif m.group(1):
ascTag = m.group(1)
- msgType = "ENC"
+ msgType = "ENC"
idx = _nextLine(msg, idx)
elif m.group(2):
if m.group(2) == 'overcompressed':
- msgType = 'LONG'
+ msgType = 'LONG'
elif m.group(2) == 'binary':
msgType = 'BIN'
else:
Index: ServerInfo.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ServerInfo.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- ServerInfo.py 13 Feb 2003 10:56:40 -0000 1.38
+++ ServerInfo.py 20 Feb 2003 16:57:39 -0000 1.39
@@ -357,7 +357,7 @@
},
'Recommended-Software': {"__SECTION__": ("ALLOW", None, None),
"MixminionClient": ("ALLOW", None, None),
- "MixminionServer": ("ALLOW", None, None), }
+ "MixminionServer": ("ALLOW", None, None), }
}
def __init__(self, contents, expectedDigest):
"""Parse a directory header out of a provided string; validate it
Index: test.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/test.py,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- test.py 20 Feb 2003 06:33:02 -0000 1.93
+++ test.py 20 Feb 2003 16:57:40 -0000 1.94
@@ -4385,7 +4385,7 @@
self.assertEquals(queue.retrySchedule, [0,0,0,3])
try:
# Try queueing a message...
- queue.queueDeliveryMessage(FDP('enc', MBOX_TYPE, 'mixdiddy',
+ queue.queueDeliveryMessage(FDP('enc', MBOX_TYPE, 'mixdiddy',
hexread("EFFACEAB1EFACADE")*20, "x"*20))
self.assertEquals(getReplacedFunctionCallLog(), [])
# ...and sending it.
@@ -4446,7 +4446,7 @@
try:
suspendLog()
queue.queueDeliveryMessage(
- FDP('plain', 0xFFFE, "FAIL!",
+ FDP('plain', 0xFFFE, "FAIL!",
"This is message X which won't be delivered", "x"*20))
self.assert_(not os.path.exists(os.path.join(dir, "2")))
finally: