From 20160e806199474c8481215236696f16f573ce8a Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 14 Dec 2017 14:53:08 -0800 Subject: mpm: rpc_server: Fix use of to_binary_str() Reviewed-By: Brent Stapleton --- mpm/python/usrp_mpm/rpc_server.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'mpm/python/usrp_mpm') diff --git a/mpm/python/usrp_mpm/rpc_server.py b/mpm/python/usrp_mpm/rpc_server.py index e1e871869..51ba9272b 100644 --- a/mpm/python/usrp_mpm/rpc_server.py +++ b/mpm/python/usrp_mpm/rpc_server.py @@ -23,6 +23,7 @@ from builtins import str, bytes from builtins import range from mprpc import RPCServer from usrp_mpm.mpmlog import get_main_logger +from usrp_mpm.mpmutils import to_binary_str TIMEOUT_INTERVAL = 3.0 # Seconds before claim expires TOKEN_LEN = 16 # Length of the token string @@ -80,11 +81,7 @@ class MPMServer(RPCServer): - The device is currently claimed - The claim token matches the one passed in """ - try: - token = bytes(token, 'ascii') - except TypeError: - pass - + token = to_binary_str(token) return self._state.claim_status.value and \ len(token) == TOKEN_LEN and \ self._state.claim_token.value == token -- cgit v1.2.3