[tor-commits] [obfs-flash/master] - fix client for Twisted 12

[infinity0@xxxxxxxxxxxxxx]

commit 703f82bf8d77b14d7c78b7aef408b76054615f2f
Author: Ximin Luo <infinity0@xxxxxxx>
Date:   Wed Oct 23 16:57:44 2013 +0100

    - fix client for Twisted 12
---
 obfs-flash-client |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/obfs-flash-client b/obfs-flash-client
index f5169f8..24a2d67 100755
--- a/obfs-flash-client
+++ b/obfs-flash-client
@@ -185,7 +185,8 @@ def pt_launch_child(reactor, client, methodnames, cmdline):
         }.items()),
         )
     sub_protocol = ManagedTransportProtocolV1()
-    StandardIO(sub_protocol, stdin=sub_proc.stdout.fileno(), reactor=reactor)
+    # we ought to pass reactor=reactor in below, but this breaks Twisted 12
+    StandardIO(sub_protocol, stdin=sub_proc.stdout.fileno())
     methoddefers = [sub_protocol.whenCMethodsDone().addCallback(
                         partial(pt_require_child, client, name))
                     for name in methodnames]



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