From 5c84f6a37336feea1c4416eab0a2298bb59ae68c Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Tue, 3 Apr 2018 17:10:46 -0700 Subject: [PATCH] wormhole: slightly different way to unicode-encode the version (this is somewhat more in line with how this distinction is made elsewhere in the code) --- src/wormhole/wormhole.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wormhole/wormhole.py b/src/wormhole/wormhole.py index 7522f8d..311e3fc 100644 --- a/src/wormhole/wormhole.py +++ b/src/wormhole/wormhole.py @@ -231,10 +231,10 @@ def create(appid, relay_url, reactor, # use keyword args for everything else w = _DeferredWormhole(eq) wormhole_versions = {} # will be used to indicate Wormhole capabilities wormhole_versions["app_versions"] = versions # app-specific capabilities - if type(__version__) == str: - client_version = ("python", __version__) - else: - client_version = ("python", __version__.decode("utf-8", errors="replace")) + v = __version__ + if isinstance(v, type(b"")): + v = v.decode("utf-8", errors="replace") + client_version = ("python", v) b = Boss(w, side, relay_url, appid, wormhole_versions, client_version, reactor, journal, tor, timing) w._set_boss(b)