move DefaultTCP to foolscap.connections.tcp

This is a reasonably stable place to expose the DefaultTCP connection-hint handler. I wasn't really satisfied with the previous location (foolscap.connection_plugins). Also I want to add socks and Tor handlers in their own files (foolscap.connections.socks and .tor) which can be imported independently (in particular they can *fail* to be imported, throwing Import Error when the necessary external txsocksx/txtorcon dependencies aren't installed, without breaking DefaultTCP). closes ticket:260
warner · Jul 7, 2016 · 8b857d5 · 8b857d5
1 parent 3a7ce26
commit 8b857d5
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -51,6 +51,7 @@ def run(self):
 
     "package_dir": {"": "src"},
     "packages": ["foolscap", "foolscap.slicers", "foolscap.logging",
+                 "foolscap.connections",
                  "foolscap.appserver", "foolscap.test"],
     "entry_points": {"console_scripts": [
         "flogtool = foolscap.logging.cli:run_flogtool",

diff --git a/src/foolscap/connection.py b/src/foolscap/connection.py
@@ -6,7 +6,7 @@
 from foolscap.logging.log import CURIOUS, UNUSUAL, OPERATIONAL
 from foolscap.util import isSubstring
 from foolscap.ipb import InvalidHintError
-from foolscap.connection_plugins import convert_legacy_hint
+from foolscap.connections.tcp import convert_legacy_hint
 
 class TubConnectorFactory(protocol.Factory, object):
     # this is for internal use only. Application code should use

diff --git a/src/foolscap/connections/__init__.py b/src/foolscap/connections/__init__.py
diff --git a/src/foolscap/connection_plugins.py → src/foolscap/connections/tcp.py b/src/foolscap/connection_plugins.py → src/foolscap/connections/tcp.py
diff --git a/src/foolscap/pb.py b/src/foolscap/pb.py
@@ -12,7 +12,7 @@
 
 from foolscap import ipb, base32, negotiate, broker, eventual, storage
 from foolscap import connection, util
-from foolscap.connection_plugins import DefaultTCP
+from foolscap.connections.tcp import DefaultTCP
 from foolscap.referenceable import SturdyRef
 from foolscap.tokens import PBError, BananaError, WrongTubIdError, \
      WrongNameError, NoLocationError

diff --git a/src/foolscap/test/test_connection.py b/src/foolscap/test/test_connection.py
@@ -4,7 +4,7 @@
 from twisted.application import service
 from foolscap.api import Tub
 from foolscap.connection import get_endpoint
-from foolscap.connection_plugins import convert_legacy_hint, DefaultTCP
+from foolscap.connections.tcp import convert_legacy_hint, DefaultTCP
 from foolscap.tokens import NoLocationHintsError
 from foolscap.test.common import (certData_low, certData_high, Target,
                                   ShouldFailMixin)