open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cosmetic changes, remove debug print

Browse Source
This commit is contained in:
Brian Warner 2018-04-03 17:05:33 -07:00
parent 1197e5fb6d
commit 0dd3a12546
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wormhole/_rendezvous.py
View File

@ -167,7 +167,7 @@ class RendezvousConnector(object):
self._ws = proto self._ws = proto
try: try:
self._tx("bind", appid=self._appid, side=self._side, self._tx("bind", appid=self._appid, side=self._side,
client_version=self._client_version) client_version=self._client_version)
self._N.connected() self._N.connected()
self._M.connected() self._M.connected()
self._L.connected() self._L.connected()

3
src/wormhole/test/test_machines.py
View File

@ -1451,7 +1451,6 @@ class Rendezvous(unittest.TestCase):
journal = ImmediateJournal() journal = ImmediateJournal()
tor_manager = None tor_manager = None
client_version = ("python", __version__) client_version = ("python", __version__)
print(client_version)
rc = _rendezvous.RendezvousConnector("ws://host:4000/v1", "appid", rc = _rendezvous.RendezvousConnector("ws://host:4000/v1", "appid",
"side", reactor, "side", reactor,
journal, tor_manager, journal, tor_manager,
@ -1505,7 +1504,7 @@ class Rendezvous(unittest.TestCase):
self.assertEqual(c[1][1], False, ws.mock_calls) self.assertEqual(c[1][1], False, ws.mock_calls)
yield bytes_to_dict(c[1][0]) yield bytes_to_dict(c[1][0])
self.assertEqual(list(sent_messages(ws)), self.assertEqual(list(sent_messages(ws)),
[dict(appid="appid", side="side", [dict(appid="appid", side="side",
client_version=["python", __version__], client_version=["python", __version__],
id="0000", type="bind"), id="0000", type="bind"),
]) ])

3
src/wormhole/wormhole.py
View File

@ -231,11 +231,10 @@ def create(appid, relay_url, reactor, # use keyword args for everything else
w = _DeferredWormhole(eq) w = _DeferredWormhole(eq)
wormhole_versions = {} # will be used to indicate Wormhole capabilities wormhole_versions = {} # will be used to indicate Wormhole capabilities
wormhole_versions["app_versions"] = versions # app-specific capabilities wormhole_versions["app_versions"] = versions # app-specific capabilities
if (type(__version__) == str): if type(__version__) == str:
client_version = ("python", __version__) client_version = ("python", __version__)
else: else:
client_version = ("python", __version__.decode("utf-8", errors="replace")) client_version = ("python", __version__.decode("utf-8", errors="replace"))
b = Boss(w, side, relay_url, appid, wormhole_versions, client_version, b = Boss(w, side, relay_url, appid, wormhole_versions, client_version,
reactor, journal, tor, timing) reactor, journal, tor, timing)
w._set_boss(b) w._set_boss(b)