summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvery Pennarun <apenwarr@gmail.com>2010-10-01 11:55:45 -0700
committerAvery Pennarun <apenwarr@gmail.com>2010-10-01 11:55:45 -0700
commit7d3028dee23adabd8b92e91c9cdc2cde65934fdd (patch)
treeace6e74a56b123845f583262027b496582f4ce6e
parent518df41049692c8f4efec840fe246ee2f164f28e (diff)
Remove list comprehensions for python 2.3 compatibility.
-rw-r--r--server.py5
-rw-r--r--ssnet.py5
2 files changed, 7 insertions, 3 deletions
diff --git a/server.py b/server.py
index ea2b067..b9e0635 100644
--- a/server.py
+++ b/server.py
@@ -122,8 +122,9 @@ def main():
socket.fromfd(sys.stdout.fileno(),
socket.AF_INET, socket.SOCK_STREAM))
handlers.append(mux)
- routepkt = ''.join('%s,%d\n' % r
- for r in routes)
+ routepkt = ''
+ for r in routes:
+ routepkt += '%s,%d\n' % r
mux.send(0, ssnet.CMD_ROUTES, routepkt)
hw = Hostwatch()
diff --git a/ssnet.py b/ssnet.py
index 55efa04..932fab4 100644
--- a/ssnet.py
+++ b/ssnet.py
@@ -247,7 +247,10 @@ class Mux(Handler):
return self.chani
def amount_queued(self):
- return sum(len(b) for b in self.outbuf)
+ total = 0
+ for b in self.outbuf:
+ total += len(b)
+ return total
def check_fullness(self):
if self.fullness > 32768: