summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Berry <stereotype441@gmail.com>2011-08-12 15:58:34 -0700
committerPaul Berry <stereotype441@gmail.com>2011-08-12 16:06:58 -0700
commite8bd8ab9a8d692ef9c761281c51fe0412a0663da (patch)
treea77e763ca79831294baa8928086a2b6aa19a1403
parentb3554717e1077b85d59279da1e72f2524d0f0b15 (diff)
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
-rw-r--r--framework/exectest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/exectest.py b/framework/exectest.py
index e3327b10..dc9dc9e1 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()