Fix qglbuffer test on Python3.

2 files changed, 11 insertions, 7 deletions

diff --git a/tests/QtOpenGL/qglbuffer_test.py b/tests/QtOpenGL/qglbuffer_test.py
index 09c2c5247..8d6d50358 100644
--- a/tests/QtOpenGL/qglbuffer_test.py
+++ b/tests/QtOpenGL/qglbuffer_test.py
@@ -5,7 +5,7 @@ import unittest
 
 from PySide.QtCore import QByteArray
 from PySide.QtOpenGL import QGLBuffer, QGLWidget
-
+import py3kcompat as py3k
 from helper import UsesQApplication
 
 class QGLBufferTest(UsesQApplication):
@@ -16,9 +16,9 @@ class QGLBufferTest(UsesQApplication):
         b = QGLBuffer()
         b.setUsagePattern(QGLBuffer.DynamicDraw)
 
-        self.assert_(b.create())
-        self.assert_(b.bufferId() != 0)
-        self.assert_(b.bind())
+        self.assertTrue(b.create())
+        self.assertTrue(b.bufferId() != 0)
+        self.assertTrue(b.bind())
 
         data = QByteArray("12345")
         b.allocate(data)
@@ -26,15 +26,15 @@ class QGLBufferTest(UsesQApplication):
 
         m = b.map(QGLBuffer.ReadOnly)
         if m:
-            self.assertEqual(m, buffer(data.data()))
+            self.assertEqual(m, py3k.buffer(py3k.b(data.data())))
             b.unmap()
 
             m = b.map(QGLBuffer.ReadWrite)
-            m[3] = 'A'
+            m[3] = py3k.b('A')
             b.unmap()
             result, rdata = b.read(3, 1)
             self.assertTrue(result)
-            self.assertEqual('A', rdata.data())
+            self.assertEqual(py3k.b('A'), rdata.data())
         else:
             print(" memory mapping is not possible in this OpenGL implementation.")
         b.release()
diff --git a/tests/util/py3xfunctions.py b/tests/util/py3xfunctions.py
index 3b89867a6..4b8d80154 100644
--- a/tests/util/py3xfunctions.py
+++ b/tests/util/py3xfunctions.py
@@ -1,4 +1,6 @@
 def b(s):
+    if type(s) == bytes:
+        return s
     return bytes(s, "UTF8")
 
 def buffer_(s):
@@ -6,6 +8,8 @@ def buffer_(s):
         return None
     elif type(s) == str:
         return bytes(s, "UTF8")
+    elif type(s) == bytes:
+        return s
     else:
         memoryview(s)