[tor-commits] [pytorctl/master] Fix a python 2.5 traceback in recent 'body' commit.

[mikeperry@xxxxxxxxxxxxxx]

commit 96133c805d3e5402f6444e71a4555c6b410986e7
Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date:   Thu Feb 24 03:49:05 2011 -0800

    Fix a python 2.5 traceback in recent 'body' commit.
---
 TorCtl.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/TorCtl.py b/TorCtl.py
index 4319242..5403a95 100755
--- a/TorCtl.py
+++ b/TorCtl.py
@@ -266,8 +266,8 @@ class ORConnEvent(Event):
     self.ncircs = ncircs
 
 class StreamBwEvent(Event):
-  def __init__(self, event_name, strm_id, written, read, body):
-    Event.__init__(self, event_name, body)
+  def __init__(self, event_name, saved_body, strm_id, written, read):
+    Event.__init__(self, event_name, saved_body)
     self.strm_id = int(strm_id)
     self.bytes_read = int(read)
     self.bytes_written = int(written)
@@ -1431,7 +1431,7 @@ class EventHandler(EventSink):
       m = re.match(r"(\d+)\s+(\d+)\s+(\d+)", body)
       if not m:
         raise ProtocolError("STREAM_BW event misformatted.")
-      event = StreamBwEvent(evtype, *m.groups(), body=body)
+      event = StreamBwEvent(evtype, body, *m.groups())
     elif evtype == "BW":
       m = re.match(r"(\d+)\s+(\d+)", body)
       if not m:

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits