From ae21d2705fc46725e1f9af1651b68d16155d1501 Mon Sep 17 00:00:00 2001 From: Tobias Mueller Date: Wed, 30 Nov 2016 23:08:47 +0100 Subject: [PATCH] python: Check "buffer" when writing to sys.stdout for python2 compat. * lang/python/tests/support.py (print_data): Add check for buffer. -- When running with something like make -C lang/python check verbose=2 the test would fail under python2, because the file objects do not have a buffer property. Signed-off-by: Tobias Mueller --- lang/python/tests/support.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lang/python/tests/support.py b/lang/python/tests/support.py index f991c6d1..0b04bb6f 100644 --- a/lang/python/tests/support.py +++ b/lang/python/tests/support.py @@ -48,7 +48,11 @@ def print_data(data): except: # Hope for the best. pass - sys.stdout.buffer.write(data) + + if hasattr(sys.stdout, "buffer"): + sys.stdout.buffer.write(data) + else: + sys.stdout.write(data) def mark_key_trusted(ctx, key): class Editor(object):