# HG changeset patch # User Denis Laxalde # Date 1528278975 -7200 # Node ID e116275bf1acfef8c1aad77ffb70f982e8a74e3f # Parent d46753a9a2a5fbcf7c056927b5883a59f774797a [py3] Decode subprocess stdout in toolsutils.show_diffs() On Python 3, subprocess' pipes are bytes stream so we must decode them before printing. Without this change, diff of configuration files (e.g. all-in-one.conf as displayed upon instance upgrade) will rendered as a single line on Python 3. diff -r d46753a9a2a5 -r e116275bf1ac cubicweb/toolsutils.py --- a/cubicweb/toolsutils.py Thu May 03 16:47:51 2018 +0200 +++ b/cubicweb/toolsutils.py Wed Jun 06 11:56:15 2018 +0200 @@ -96,7 +96,7 @@ """ import shutil pipe = subprocess.Popen(['diff', '-u', appl_file, ref_file], stdout=subprocess.PIPE) - diffs = pipe.stdout.read() + diffs = pipe.stdout.read().decode('utf-8') if diffs: if askconfirm: print()