jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed unittest to work with python3.

Browse source
This commit is contained in:
Renato Filho 2011-10-07 15:03:53 -03:00 • committed by Hugo Parente Lima
commit 1cefc09118
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/QtGui/qimage_test.py
View file

@ -255,8 +255,12 @@ class QImageTest(UsesQApplication):
data1 = img0.scanLine(0) data1 = img0.scanLine(0)
data2 = img1.scanLine(0) data2 = img1.scanLine(0)
self.assertEqual(data1, data2) self.assertEqual(data1, data2)
self.assertEqual(data1, py3k.buffer(img0.bits()[:img0.bytesPerLine()]))
self.assertEqual(data2, py3k.buffer(img0.bits()[:img0.bytesPerLine()])) # PySide python 3.x does not support slice yet
if not py3k.IS_PY3K:
buff = py3k.buffer(img0.bits()[:img0.bytesPerLine()])
self.assertEqual(data1, buff)
self.assertEqual(data2, buff)
def testEmptyBuffer(self): def testEmptyBuffer(self):
img = QImage(py3k.buffer(''), 100, 100, QImage.Format_ARGB32) img = QImage(py3k.buffer(''), 100, 100, QImage.Format_ARGB32)

10
tests/util/py3xfunctions.py
View file

@ -1,6 +1,14 @@
def b(s): def b(s):
return bytes(s, "UTF8") return bytes(s, "UTF8")
def buffer_(s):
if s == None:
return None
elif type(s) == str:
return bytes(s, "UTF8")
else:
memoryview(s)
def l(n): def l(n):
return n return n
@ -11,4 +19,4 @@ unicode = str
unichr = chr unichr = chr
long = int long = int
unichr = chr unichr = chr
buffer = b buffer = buffer_