From 4e937c210021da679dc1efe13e529e9299d160d3 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Fri, 15 Apr 2016 16:37:23 -0700 Subject: [PATCH] rename cmd_send_twisted to cmd_send, same for cmd_receive --- .../scripts/{cmd_receive_twisted.py => cmd_receive.py} | 0 src/wormhole/scripts/{cmd_send_twisted.py => cmd_send.py} | 0 src/wormhole/scripts/runner.py | 8 ++++---- src/wormhole/test/test_scripts.py | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) rename src/wormhole/scripts/{cmd_receive_twisted.py => cmd_receive.py} (100%) rename src/wormhole/scripts/{cmd_send_twisted.py => cmd_send.py} (100%) diff --git a/src/wormhole/scripts/cmd_receive_twisted.py b/src/wormhole/scripts/cmd_receive.py similarity index 100% rename from src/wormhole/scripts/cmd_receive_twisted.py rename to src/wormhole/scripts/cmd_receive.py diff --git a/src/wormhole/scripts/cmd_send_twisted.py b/src/wormhole/scripts/cmd_send.py similarity index 100% rename from src/wormhole/scripts/cmd_send_twisted.py rename to src/wormhole/scripts/cmd_send.py diff --git a/src/wormhole/scripts/runner.py b/src/wormhole/scripts/runner.py index bb71b8c..8cff151 100644 --- a/src/wormhole/scripts/runner.py +++ b/src/wormhole/scripts/runner.py @@ -22,13 +22,13 @@ def dispatch(args): return cmd_usage.tail_usage(args) if args.func == "send/send": - from . import cmd_send_twisted - return cmd_send_twisted.send_twisted_sync(args) + from . import cmd_send + return cmd_send.send_twisted_sync(args) if args.func == "receive/receive": _start = args.timing.add_event("import c_r_t") - from . import cmd_receive_twisted + from . import cmd_receive 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) diff --git a/src/wormhole/test/test_scripts.py b/src/wormhole/test/test_scripts.py index 826263f..e5c0847 100644 --- a/src/wormhole/test/test_scripts.py +++ b/src/wormhole/test/test_scripts.py @@ -6,8 +6,8 @@ from twisted.internet.utils import getProcessOutputAndValue from twisted.internet.defer import inlineCallbacks from .. import __version__ from .common import ServerBase -from ..scripts import runner, cmd_send_twisted, cmd_receive_twisted -from ..scripts.cmd_send_twisted import build_phase1_data +from ..scripts import runner, cmd_send, cmd_receive +from ..scripts.cmd_send import build_phase1_data from ..errors import TransferError from ..timing import DebugTiming @@ -311,8 +311,8 @@ class PregeneratedCode(ServerBase, ScriptsBase, unittest.TestCase): rargs.stdout = io.StringIO() rargs.stderr = io.StringIO() rargs.timing = DebugTiming() - send_d = cmd_send_twisted.send_twisted(sargs) - receive_d = cmd_receive_twisted.receive_twisted(rargs) + send_d = cmd_send.send_twisted(sargs) + receive_d = cmd_receive.receive_twisted(rargs) # The sender might fail, leaving the receiver hanging, or vice # versa. If either side fails, cancel the other, so it won't