# HG changeset patch # User Houzefa Abbasbhay <houzefa.abba@xcg-consulting.fr> # Date 1550763423 -3600 # Thu Feb 21 16:37:03 2019 +0100 # Node ID 70dbf4256e87fc4cd61e9fdcda87197100d4c465 # Parent ff58048bc1db468fc9f97e099255b1d60b4053bf docker_build.py: byte-to-string conv for Python 3 diff --git a/docker_build.py b/docker_build.py --- a/docker_build.py +++ b/docker_build.py @@ -160,7 +160,7 @@ buildargs = dict() if os.path.exists('.hg'): buildargs['REVISION'] = check_output( - 'hg identify -i'.split()).split()[0] + 'hg identify -i'.split()).split()[0].decode('utf-8') buildargs['CREATED'] = datetime.datetime.now().isoformat() if nmspc.build_arg: for arg in nmspc.build_arg: @@ -202,7 +202,7 @@ # this is for python docker 1.8-1.9 # TODO add compatibility with newer python docker for line in builder: - d = json.loads(line) + d = json.loads(line.decode('utf-8')) if 'stream' in d: logging.info(d['stream']) if 'errorDetail' in d: