open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename cmd_send_twisted to cmd_send, same for cmd_receive

Browse Source
This commit is contained in:
Brian Warner 2016-04-15 16:37:23 -07:00
parent a1033b06a3
commit 4e937c2100
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/wormhole/scripts/cmd_receive_twisted.py → src/wormhole/scripts/cmd_receive.py
View File

0
src/wormhole/scripts/cmd_send_twisted.py → src/wormhole/scripts/cmd_send.py
View File

8
src/wormhole/scripts/runner.py
View File

@ -22,13 +22,13 @@ def dispatch(args):
return cmd_usage.tail_usage(args) return cmd_usage.tail_usage(args)
if args.func == "send/send": if args.func == "send/send":
from . import cmd_send_twisted from . import cmd_send
return cmd_send_twisted.send_twisted_sync(args) return cmd_send.send_twisted_sync(args)
if args.func == "receive/receive": if args.func == "receive/receive":
_start = args.timing.add_event("import c_r_t") _start = args.timing.add_event("import c_r_t")
from . import cmd_receive_twisted from . import cmd_receive
args.timing.finish_event(_start) args.timing.finish_event(_start)
return cmd_receive_twisted.receive_twisted_sync(args) return cmd_receive.receive_twisted_sync(args)
raise ValueError("unknown args.func %s" % args.func) raise ValueError("unknown args.func %s" % args.func)

8
src/wormhole/test/test_scripts.py
View File

@ -6,8 +6,8 @@ from twisted.internet.utils import getProcessOutputAndValue
from twisted.internet.defer import inlineCallbacks from twisted.internet.defer import inlineCallbacks
from .. import __version__ from .. import __version__
from .common import ServerBase from .common import ServerBase
from ..scripts import runner, cmd_send_twisted, cmd_receive_twisted from ..scripts import runner, cmd_send, cmd_receive
from ..scripts.cmd_send_twisted import build_phase1_data from ..scripts.cmd_send import build_phase1_data
from ..errors import TransferError from ..errors import TransferError
from ..timing import DebugTiming from ..timing import DebugTiming
@ -311,8 +311,8 @@ class PregeneratedCode(ServerBase, ScriptsBase, unittest.TestCase):
rargs.stdout = io.StringIO() rargs.stdout = io.StringIO()
rargs.stderr = io.StringIO() rargs.stderr = io.StringIO()
rargs.timing = DebugTiming() rargs.timing = DebugTiming()
send_d = cmd_send_twisted.send_twisted(sargs) send_d = cmd_send.send_twisted(sargs)
receive_d = cmd_receive_twisted.receive_twisted(rargs) receive_d = cmd_receive.receive_twisted(rargs)
# The sender might fail, leaving the receiver hanging, or vice # The sender might fail, leaving the receiver hanging, or vice
# versa. If either side fails, cancel the other, so it won't # versa. If either side fails, cancel the other, so it won't