From e8bd8ab9a8d692ef9c761281c51fe0412a0663da Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Fri, 12 Aug 2011 15:58:34 -0700 Subject: Fix Python 2.6 incompatibility in str.decode() function. In Python 2.6, the str.decode() function can't take keyword arguments, so x.decode(y, errors=z) must be changed to x.decode(y, z). There is no difference in functionality. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=40051 --- framework/exectest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/exectest.py b/framework/exectest.py index e3327b10f..dc9dc9e12 100644 --- a/framework/exectest.py +++ b/framework/exectest.py @@ -69,8 +69,8 @@ class ExecTest(Test): # replaces erroneous charcters with the Unicode # "replacement character" (a white question mark inside # a black diamond). - out = out.decode('utf-8', errors='replace') - err = err.decode('utf-8', errors='replace') + out = out.decode('utf-8', 'replace') + err = err.decode('utf-8', 'replace') results = TestResult() -- cgit v1.2.3