unsplit cli step 2: edit files

setup.py

@@ -16,13 +16,13 @@ setup(name="magic-wormhole",
       packages=["wormhole",
                 "wormhole.blocking",
                 "txwormhole",
-                "wormhole_cli",
+                "wormhole.cli",
                 "wormhole_server",
                 "wormhole.test",
                 ],
       package_data={"wormhole_server": ["db-schemas/*.sql"]},
       entry_points={"console_scripts":
-                    ["wormhole = wormhole_cli.runner:entry",
+                    ["wormhole = wormhole.cli.runner:entry",
                      "wormhole-server = wormhole_server.runner:entry",
                      ]},
       install_requires=["spake2==0.3", "pynacl", "requests", "argparse",

src/wormhole/cli/__init__.py

@@ -1,2 +0,0 @@
-from wormhole import __version__
-__version__ # hush pyflakes

src/wormhole/cli/cli_args.py

@@ -1,7 +1,7 @@
 import argparse
 from textwrap import dedent
 from . import public_relay
-from wormhole import __version__
+from .. import __version__
 
 parser = argparse.ArgumentParser(
     usage="wormhole SUBCOMMAND (subcommand-options)",

src/wormhole/cli/cmd_receive.py

@@ -4,7 +4,7 @@ from twisted.internet import reactor, defer
 from twisted.internet.defer import inlineCallbacks, returnValue
 from txwormhole.transcribe import Wormhole, WrongPasswordError
 from txwormhole.transit import TransitReceiver
-from wormhole.errors import TransferError
+from ..errors import TransferError
 from .progress import ProgressPrinter
 
 

src/wormhole/cli/cmd_send.py

@@ -3,7 +3,7 @@ import os, sys, io, json, binascii, six, tempfile, zipfile
 from twisted.protocols import basic
 from twisted.internet import reactor
 from twisted.internet.defer import inlineCallbacks, returnValue
-from wormhole.errors import TransferError
+from ..errors import TransferError
 from .progress import ProgressPrinter
 from txwormhole.transcribe import Wormhole, WrongPasswordError
 from txwormhole.transit import TransitSender

src/wormhole/cli/runner.py

@@ -2,7 +2,7 @@ from __future__ import print_function
 import os, sys
 from twisted.internet.defer import maybeDeferred
 from twisted.internet.task import react
-from wormhole.timing import DebugTiming
+from ..timing import DebugTiming
 from .cli_args import parser
 
 def dispatch(args): # returns Deferred

src/wormhole/test/test_progress.py

@@ -1,7 +1,7 @@
 from __future__ import print_function
 import io, time
 from twisted.trial import unittest
-from wormhole_cli import progress
+from ..cli import progress
 
 class Progress(unittest.TestCase):
     def test_time(self):

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 wormhole_cli import runner, cmd_send, cmd_receive
+from ..cli import runner, cmd_send, cmd_receive
-from wormhole_cli.cmd_send import build_phase1_data
+from ..cli.cmd_send import build_phase1_data
 from ..errors import TransferError
 from ..timing import DebugTiming