In python2 the code as is works, although there might be odd corners. In
python 3 it fails because the code tries to match bytes and strs, which
doesn't work at all.

This patch fixes the issue by converting the output from bytes to str
(unicode) immediately, so we don't have to think about it again.

CC: Eric Anholt <e...@anholt.net>
Reported-by: Dan Kegel <d...@kegel.com>
Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com>
---
 framework/driver_classifier.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/driver_classifier.py b/framework/driver_classifier.py
index c63b88d..dcef6cd 100644
--- a/framework/driver_classifier.py
+++ b/framework/driver_classifier.py
@@ -55,8 +55,8 @@ class DriverClassifier(object):
         """
 
         try:
-            output = subprocess.check_output(['glxinfo'],
-                                             stderr=subprocess.STDOUT)
+            output = subprocess.check_output(
+                ['glxinfo'], stderr=subprocess.STDOUT).decode('utf-8')
         except OSError as e:
             if e.errno not in [errno.ENOENT, errno.EACCES]:
                 raise
-- 
2.9.3

_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

Reply via email to