From b2c3f49038bb391234cba38e7aa294759d387397 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Wed, 20 Apr 2016 19:11:29 -0700 Subject: [PATCH] unsplit txwormhole step 2: edit files --- setup.py | 2 +- src/wormhole/cli/cmd_receive.py | 6 +++--- src/wormhole/cli/cmd_send.py | 6 +++--- src/wormhole/test/common.py | 2 +- src/wormhole/test/test_interop.py | 2 +- src/wormhole/test/test_server.py | 2 +- src/wormhole/test/test_transit_twisted.py | 2 +- src/wormhole/test/test_twisted.py | 2 +- src/wormhole/twisted/__init__.py | 2 -- src/wormhole/twisted/tor_manager.py | 2 +- src/wormhole/twisted/transcribe.py | 8 ++++---- src/wormhole/twisted/transit.py | 4 ++-- 12 files changed, 19 insertions(+), 21 deletions(-) diff --git a/setup.py b/setup.py index 4a01c6a..650d472 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ setup(name="magic-wormhole", package_dir={"": "src"}, packages=["wormhole", "wormhole.blocking", - "txwormhole", + "wormhole.twisted", "wormhole.cli", "wormhole.server", "wormhole.test", diff --git a/src/wormhole/cli/cmd_receive.py b/src/wormhole/cli/cmd_receive.py index c4d03e4..14716dc 100644 --- a/src/wormhole/cli/cmd_receive.py +++ b/src/wormhole/cli/cmd_receive.py @@ -2,8 +2,8 @@ from __future__ import print_function import io, os, sys, json, binascii, six, tempfile, zipfile 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 ..twisted.transcribe import Wormhole, WrongPasswordError +from ..twisted.transit import TransitReceiver from ..errors import TransferError from .progress import ProgressPrinter @@ -33,7 +33,7 @@ class TwistedReceiver: tor_manager = None if self.args.tor: _start = self.args.timing.add_event("import TorManager") - from txwormhole.tor_manager import TorManager + from ..twisted.tor_manager import TorManager self.args.timing.finish_event(_start) tor_manager = TorManager(self._reactor, timing=self.args.timing) # For now, block everything until Tor has started. Soon: launch diff --git a/src/wormhole/cli/cmd_send.py b/src/wormhole/cli/cmd_send.py index e3faa4b..9e6fad1 100644 --- a/src/wormhole/cli/cmd_send.py +++ b/src/wormhole/cli/cmd_send.py @@ -5,8 +5,8 @@ from twisted.internet import reactor from twisted.internet.defer import inlineCallbacks, returnValue from ..errors import TransferError from .progress import ProgressPrinter -from txwormhole.transcribe import Wormhole, WrongPasswordError -from txwormhole.transit import TransitSender +from ..twisted.transcribe import Wormhole, WrongPasswordError +from ..twisted.transit import TransitSender APPID = u"lothar.com/wormhole/text-or-file-xfer" @@ -108,7 +108,7 @@ def send_twisted(args, reactor=reactor): tor_manager = None if args.tor: - from txwormhole.tor_manager import TorManager + from ..twisted.tor_manager import TorManager tor_manager = TorManager(reactor, timing=args.timing) # For now, block everything until Tor has started. Soon: launch tor # in parallel with everything else, make sure the TorManager can diff --git a/src/wormhole/test/common.py b/src/wormhole/test/common.py index bffa9c5..382cbfe 100644 --- a/src/wormhole/test/common.py +++ b/src/wormhole/test/common.py @@ -1,7 +1,7 @@ from twisted.application import service from twisted.internet import reactor, defer from twisted.python import log -from txwormhole.transit import allocate_tcp_port +from ..twisted.transit import allocate_tcp_port from ..server.server import RelayServer from .. import __version__ diff --git a/src/wormhole/test/test_interop.py b/src/wormhole/test/test_interop.py index f216a6e..23daa9c 100644 --- a/src/wormhole/test/test_interop.py +++ b/src/wormhole/test/test_interop.py @@ -2,7 +2,7 @@ from __future__ import print_function from twisted.trial import unittest from twisted.internet.defer import gatherResults from twisted.internet.threads import deferToThread -from txwormhole.transcribe import Wormhole as twisted_Wormhole +from ..twisted.transcribe import Wormhole as twisted_Wormhole from ..blocking.transcribe import Wormhole as blocking_Wormhole from .common import ServerBase diff --git a/src/wormhole/test/test_server.py b/src/wormhole/test/test_server.py index bd5f47f..16542e6 100644 --- a/src/wormhole/test/test_server.py +++ b/src/wormhole/test/test_server.py @@ -13,7 +13,7 @@ from autobahn.twisted import websocket from .. import __version__ from .common import ServerBase from ..server import rendezvous, transit_server -from txwormhole.eventsource import EventSource +from ..twisted.eventsource import EventSource class Reachable(ServerBase, unittest.TestCase): diff --git a/src/wormhole/test/test_transit_twisted.py b/src/wormhole/test/test_transit_twisted.py index 2a4e50d..4e4ea81 100644 --- a/src/wormhole/test/test_transit_twisted.py +++ b/src/wormhole/test/test_transit_twisted.py @@ -6,7 +6,7 @@ from twisted.internet import defer, task, endpoints, protocol, address, error from twisted.internet.defer import gatherResults, inlineCallbacks from twisted.python import log, failure from twisted.test import proto_helpers -from txwormhole import transit +from ..twisted import transit from ..errors import UsageError from nacl.secret import SecretBox from nacl.exceptions import CryptoError diff --git a/src/wormhole/test/test_twisted.py b/src/wormhole/test/test_twisted.py index a1e5f34..61b4dd5 100644 --- a/src/wormhole/test/test_twisted.py +++ b/src/wormhole/test/test_twisted.py @@ -2,7 +2,7 @@ from __future__ import print_function import json from twisted.trial import unittest from twisted.internet.defer import gatherResults, inlineCallbacks -from txwormhole.transcribe import Wormhole, UsageError, WrongPasswordError +from ..twisted.transcribe import Wormhole, UsageError, WrongPasswordError from .common import ServerBase APPID = u"appid" diff --git a/src/wormhole/twisted/__init__.py b/src/wormhole/twisted/__init__.py index 0ff5129..e69de29 100644 --- a/src/wormhole/twisted/__init__.py +++ b/src/wormhole/twisted/__init__.py @@ -1,2 +0,0 @@ -from wormhole import __version__ -__version__ # hush pyflakes diff --git a/src/wormhole/twisted/tor_manager.py b/src/wormhole/twisted/tor_manager.py index 30e8995..3545faa 100644 --- a/src/wormhole/twisted/tor_manager.py +++ b/src/wormhole/twisted/tor_manager.py @@ -8,7 +8,7 @@ from twisted.internet.error import ConnectError from twisted.web import iweb import txtorcon import ipaddr -from wormhole.timing import DebugTiming +from ..timing import DebugTiming from .transit import allocate_tcp_port # based on twisted.web.client._StandardEndpointFactory diff --git a/src/wormhole/twisted/transcribe.py b/src/wormhole/twisted/transcribe.py index 4750acd..3850724 100644 --- a/src/wormhole/twisted/transcribe.py +++ b/src/wormhole/twisted/transcribe.py @@ -10,10 +10,10 @@ from nacl.secret import SecretBox from nacl.exceptions import CryptoError from nacl import utils from spake2 import SPAKE2_Symmetric -from wormhole import __version__ -from wormhole import codes -from wormhole.errors import ServerError, Timeout, WrongPasswordError, UsageError -from wormhole.timing import DebugTiming +from .. import __version__ +from .. import codes +from ..errors import ServerError, Timeout, WrongPasswordError, UsageError +from ..timing import DebugTiming from hkdf import Hkdf def HKDF(skm, outlen, salt=None, CTXinfo=b""): diff --git a/src/wormhole/twisted/transit.py b/src/wormhole/twisted/transit.py index 70eb108..8d3d757 100644 --- a/src/wormhole/twisted/transit.py +++ b/src/wormhole/twisted/transit.py @@ -9,8 +9,8 @@ from twisted.internet.defer import inlineCallbacks, returnValue from twisted.protocols import policies from nacl.secret import SecretBox from hkdf import Hkdf -from wormhole.errors import UsageError -from wormhole.timing import DebugTiming +from ..errors import UsageError +from ..timing import DebugTiming from . import ipaddrs def HKDF(skm, outlen, salt=None, CTXinfo=b""):