open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
58cf584fb0
magic-wormhole/src/wormhole/cli/welcome.py

25 lines
926 B
Python
Raw Normal View History

Make code pep-8 compliant
2018-04-21 07:30:08 +00:00
from __future__ import absolute_import, print_function, unicode_literals
rewrite welcome handler
2017-04-03 21:23:03 +00:00
switch to new API This renames all the existing API methods, to use a consistent "d=get_XYZ()" (for Deferred mode) or "dg.wormhole_got_XYZ()" (for Delegated mode). It updates cmd_send/cmd_receive/cmd_ssh to use the new API. Since we now have get_welcome(), apps handle the Welcome message with a Deferred callback instead of registering a "welcome handler". This lets us make sure we've finished printing any server message-of-the-day or "you should update your client" message to stdout before using stdio to ask for the wormhole code. (Previously, the code-input prompt was overwritten by the server message, and it was ugly). refs #145. This approach adds an extra roundtrip to the receiver, but we can fix that (see #145 for details). Because of that change, the server-is-being-slow message is printed at a slightly different time, so those tests needed some extra work to exercise it properly.
2017-05-12 20:12:36 +00:00
def handle_welcome(welcome, relay_url, my_version, stderr):
if "motd" in welcome:
motd_lines = welcome["motd"].splitlines()
motd_formatted = "\n ".join(motd_lines)
Make code pep-8 compliant
2018-04-21 07:30:08 +00:00
print(
"Server (at %s) says:\n %s" % (relay_url, motd_formatted),
file=stderr)
rewrite welcome handler
2017-04-03 21:23:03 +00:00
switch to new API This renames all the existing API methods, to use a consistent "d=get_XYZ()" (for Deferred mode) or "dg.wormhole_got_XYZ()" (for Delegated mode). It updates cmd_send/cmd_receive/cmd_ssh to use the new API. Since we now have get_welcome(), apps handle the Welcome message with a Deferred callback instead of registering a "welcome handler". This lets us make sure we've finished printing any server message-of-the-day or "you should update your client" message to stdout before using stdio to ask for the wormhole code. (Previously, the code-input prompt was overwritten by the server message, and it was ugly). refs #145. This approach adds an extra roundtrip to the receiver, but we can fix that (see #145 for details). Because of that change, the server-is-being-slow message is printed at a slightly different time, so those tests needed some extra work to exercise it properly.
2017-05-12 20:12:36 +00:00
# Only warn if we're running a release version (e.g. 0.0.6, not
# 0.0.6+DISTANCE.gHASH). Only warn once.
extreme measures to appease last pep8 complaint a singly-parenthesized 'if' condition will always line up with the 'then' body, won't it
2018-06-16 23:22:14 +00:00
if (("current_cli_version" in welcome and
"+" not in my_version and
welcome["current_cli_version"] != my_version)):
Make code pep-8 compliant
2018-04-21 07:30:08 +00:00
print(
("Warning: errors may occur unless both sides are running the"
" same version"),
file=stderr)
print(
"Server claims %s is current, but ours is %s" %
(welcome["current_cli_version"], my_version),
file=stderr)
Reference in New Issue Copy Permalink