From 6ee9ccbc2776d670cbfae135815672d3de2f64e0 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 29 May 2020 12:06:00 -0400 Subject: [PATCH] Fix python3 idxtoname python3 needs it to be str, not bytes as C would return. Accomodate only for python3, leave python2 the same. --- confluent_server/confluent/discovery/protocols/pxe.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/confluent_server/confluent/discovery/protocols/pxe.py b/confluent_server/confluent/discovery/protocols/pxe.py index 10d22b73..b310961d 100644 --- a/confluent_server/confluent/discovery/protocols/pxe.py +++ b/confluent_server/confluent/discovery/protocols/pxe.py @@ -113,7 +113,10 @@ _idxtoname.argtypes = [ctypes.c_uint, ctypes.c_char_p] def idxtoname(idx): name = (ctypes.c_char * 16)() _idxtoname(idx, name) - return name.value.strip() + ret = name.value.strip() + if not isinstance(ret, str): + ret = ret.deecode('utf8') + return ret _idxtobcast = {} def get_bcastaddr(idx):