xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-26 03:19:48 +00:00
Code Issues Projects Releases Wiki Activity

More fixes for python3/2 compatibility

Browse Source
This commit is contained in:
Jarrod Johnson 2019-10-14 15:22:44 -04:00
parent a84b88e269
commit 62084b3605
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
confluent_server/confluent/config/configmanager.py
View File

@ -2338,7 +2338,7 @@ class ConfigManager(object):
return
with cls._syncstate:
if (cls._syncrunning and cls._cfgwriter is not None and
not cls._cfgwriter.dead):
cls._cfgwriter.isAlive()):
cls._writepending = True
return
if cls._syncrunning: # This suggests an unclean write attempt,

3
confluent_server/confluent/discovery/core.py
View File

@ -705,7 +705,8 @@ def detected(info):
def b64tohex(b64str):
bd = base64.b64decode(b64str)
return ''.join(['{0:02x}'.format(ord(x)) for x in bd])
bd = bytearray(bd)
return ''.join(['{0:02x}'.format(x) for x in bd])
def get_enclosure_chain_head(nodename, cfg):