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

Fix bug#309 - "QtCore.QByteArray() or list from QtCore.Qsettings.value() as default"

Browse source 
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Renato Araújo <renato.araujo@openbossa.org>
This commit is contained in:
Hugo Parente Lima 2010-08-30 17:28:13 -03:00
commit d27d6958c0
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PySide/QtCore/qvariant_conversions.h
View file

@ -28,6 +28,9 @@ struct Converter<QVariant>
} else if (Converter<QString>::checkType(pyObj)) { } else if (Converter<QString>::checkType(pyObj)) {
// QVariant(const char*) // QVariant(const char*)
return QVariant(Converter<QString>::toCpp(pyObj)); return QVariant(Converter<QString>::toCpp(pyObj));
} else if (Converter<QByteArray>::checkType(pyObj)) {
// QVariant(QByteArray)
return QVariant(Converter<QByteArray>::toCpp(pyObj));
} else if (PyFloat_CheckExact(pyObj)) { } else if (PyFloat_CheckExact(pyObj)) {
// QVariant(double) // QVariant(double)
return QVariant(Converter<double>::toCpp(pyObj)); return QVariant(Converter<double>::toCpp(pyObj));

8
tests/QtCore/qbytearray_test.py
View file

@ -5,7 +5,7 @@ import unittest
import ctypes import ctypes
import sys import sys
from PySide.QtCore import QByteArray from PySide.QtCore import *
class QByteArrayTestToNumber(unittest.TestCase): class QByteArrayTestToNumber(unittest.TestCase):
def testToNumberInt(self): def testToNumberInt(self):
@ -91,8 +91,10 @@ class QByteArrayOperatorAtSetterLargeIndex(unittest.TestCase):
obj[10] = 'normal' obj[10] = 'normal'
self.assertEqual(obj, QByteArray('mystring normal')) self.assertEqual(obj, QByteArray('mystring normal'))
class QByteArrayOnQVariant(unittest.TestCase):
def testQByteArrayOnQVariant(self):
a = QSettings().value("some_prop", QByteArray())
self.assertEqual(type(a), QByteArray)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()