[tor-commits] [ooni-probe/master] Removed 'multi' kwarg from txscapy.ScapyProtocol for now, because Arturo is

isis at torproject.org isis at torproject.org
Tue Dec 18 05:53:45 UTC 2012


commit f7f03cd80b7ebfb8bdfa9763afb8707f78117c4a
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sun Nov 18 22:00:35 2012 +0000

    Removed 'multi' kwarg from txscapy.ScapyProtocol for now, because Arturo is
    correct that the parent classes don't correctly handle it.
---
 ooni/utils/txscapy.py |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py
index 9c33d18..702d7bb 100644
--- a/ooni/utils/txscapy.py
+++ b/ooni/utils/txscapy.py
@@ -57,8 +57,6 @@ class ScapyProtocol(abstract.FileDescriptor):
         self.debug = False
 
         self.multi = False
-        if kw['multi']:
-            self.multi = kw['multi']
         # XXX this needs to be implemented. It would involve keeping track of
         # the state of the sending via the super socket file descriptor and
         # firing the callback when we have concluded sending. Check out





More information about the tor-commits mailing list