split txwormhole step 2: fix imports

src/txwormhole/__init__.py

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

src/txwormhole/eventsource.py

@@ -6,7 +6,7 @@ from twisted.protocols import basic
 from twisted.web.client import Agent, ResponseDone
 from twisted.web.http_headers import Headers
 from cgi import parse_header
-from ..util.eventual import eventually
+from .eventual import eventually
 
 #if sys.version_info[0] == 2:
 #    to_unicode = unicode

src/txwormhole/tor_manager.py

@@ -8,7 +8,7 @@ from twisted.internet.error import ConnectError
 from twisted.web import iweb
 import txtorcon
 import ipaddr
-from ..timing import DebugTiming
+from wormhole.timing import DebugTiming
 from .transit import allocate_tcp_port
 
 # based on twisted.web.client._StandardEndpointFactory

src/txwormhole/transcribe.py

@@ -13,13 +13,13 @@ from nacl.secret import SecretBox
 from nacl.exceptions import CryptoError
 from nacl import utils
 from spake2 import SPAKE2_Symmetric
-from .eventsource_twisted import ReconnectingEventSource
+from .eventsource import ReconnectingEventSource
-from .. import __version__
+from wormhole import __version__
-from .. import codes
+from wormhole import codes
-from ..errors import ServerError, Timeout, WrongPasswordError, UsageError
+from wormhole.errors import ServerError, Timeout, WrongPasswordError, UsageError
-from ..timing import DebugTiming
+from wormhole.timing import DebugTiming
-from ..util.hkdf import HKDF
+from wormhole.util.hkdf import HKDF
-from ..channel_monitor import monitor
+from wormhole.channel_monitor import monitor
 
 CONFMSG_NONCE_LENGTH = 128//8
 CONFMSG_MAC_LENGTH = 256//8

src/txwormhole/transit.py

@@ -8,9 +8,9 @@ from twisted.internet import (reactor, interfaces, defer, protocol,
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.protocols import policies
 from nacl.secret import SecretBox
-from ..util.hkdf import HKDF
+from wormhole.util.hkdf import HKDF
-from ..errors import UsageError
+from wormhole.errors import UsageError
-from ..timing import DebugTiming
+from wormhole.timing import DebugTiming
 from . import ipaddrs
 
 def debug(msg):

src/wormhole/scripts/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 ..twisted.transcribe import Wormhole, WrongPasswordError
+from txwormhole.transcribe import Wormhole, WrongPasswordError
-from ..twisted.transit import TransitReceiver
+from txwormhole.transit import TransitReceiver
 from ..errors import TransferError
 from .progress import ProgressPrinter
 
@@ -55,7 +55,7 @@ class TwistedReceiver:
         tor_manager = None
         if self.args.tor:
             _start = self.args.timing.add_event("import TorManager")
-            from ..twisted.tor_manager import TorManager
+            from txwormhole.tor_manager import TorManager
             self.args.timing.finish_event(_start)
             tor_manager = TorManager(reactor, timing=self.args.timing)
             # For now, block everything until Tor has started. Soon: launch

src/wormhole/scripts/cmd_send.py

@@ -5,8 +5,8 @@ from twisted.internet import reactor, defer
 from twisted.internet.defer import inlineCallbacks, returnValue
 from ..errors import TransferError
 from .progress import ProgressPrinter
-from ..twisted.transcribe import Wormhole, WrongPasswordError
+from txwormhole.transcribe import Wormhole, WrongPasswordError
-from ..twisted.transit import TransitSender
+from txwormhole.transit import TransitSender
 
 APPID = u"lothar.com/wormhole/text-or-file-xfer"
 
@@ -130,7 +130,7 @@ def send_twisted(args):
 
     tor_manager = None
     if args.tor:
-        from ..twisted.tor_manager import TorManager
+        from txwormhole.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

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 ..twisted.transit import allocate_tcp_port
+from txwormhole.transit import allocate_tcp_port
 from wormhole_server.server import RelayServer
 from .. import __version__
 

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 ..twisted.transcribe import Wormhole as twisted_Wormhole
+from txwormhole.transcribe import Wormhole as twisted_Wormhole
 from ..blocking.transcribe import Wormhole as blocking_Wormhole
 from .common import ServerBase
 

src/wormhole/test/test_load.py

@@ -6,3 +6,5 @@ class Import(unittest.TestCase):
         self.assertTrue(len(wormhole.__version__))
         import wormhole_server
         self.assertTrue(len(wormhole_server.__version__))
+        import txwormhole
+        self.assertTrue(len(txwormhole.__version__))

src/wormhole/test/test_server.py

@@ -11,7 +11,7 @@ from twisted.web.client import getPage, Agent, readBody
 from .. import __version__
 from .common import ServerBase
 from wormhole_server import relay_server, transit_server
-from ..twisted.eventsource_twisted import EventSource
+from txwormhole.eventsource import EventSource
 
 class Reachable(ServerBase, unittest.TestCase):
 

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 ..twisted import transit
+from txwormhole import transit
 from ..errors import UsageError
 from nacl.secret import SecretBox
 from nacl.exceptions import CryptoError

src/wormhole/test/test_twisted.py

@@ -2,9 +2,9 @@ from __future__ import print_function
 import json
 from twisted.trial import unittest
 from twisted.internet.defer import gatherResults, succeed
-from ..twisted.transcribe import (Wormhole, UsageError, ChannelManager,
+from txwormhole.transcribe import (Wormhole, UsageError, ChannelManager,
-                                  WrongPasswordError)
+                                   WrongPasswordError)
-from ..twisted.eventsource_twisted import EventSourceParser
+from txwormhole.eventsource import EventSourceParser
 from .common import ServerBase
 
 APPID = u"appid"