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

Fixed function QDataStream.readRawData return value.

Browse source 
The function readRawData now return None in case of error, otherwise a
string with the read data.

Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>
This commit is contained in:
Renato Araujo Oliveira Filho 2011-01-04 18:32:24 -03:00
commit 3774752f0c
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
PySide/QtCore/typesystem_core.xml
View file

@ -2388,8 +2388,13 @@
<inject-code class="target"> <inject-code class="target">
QByteArray data; QByteArray data;
data.resize(%2); data.resize(%2);
%CPPSELF.%FUNCTION_NAME(data.data(), data.size()); int result = %CPPSELF.%FUNCTION_NAME(data.data(), data.size());
%PYARG_0 = PyString_FromStringAndSize(data.constData(), data.size()); if (result == -1) {
Py_INCREF(Py_None);
%PYARG_0 = Py_None;
} else {
%PYARG_0 = PyString_FromStringAndSize(data.data(), result);
}
</inject-code> </inject-code>
</modify-function> </modify-function>
<!-- deprecated method --> <!-- deprecated method -->

8
tests/QtCore/qdatastream_test.py
View file

@ -311,15 +311,15 @@ class QDataStreamShiftBitArray(unittest.TestCase):
class QDataStreamRawData(unittest.TestCase): class QDataStreamRawData(unittest.TestCase):
def testRawData(self): def testRawData(self):
data = QDataStream() data = QDataStream()
self.assertEqual(data.readRawData(4), '\x00\x00\x00\x00') self.assertEqual(data.readRawData(4), None)
ba = QByteArray() ba = QByteArray()
data = QDataStream(ba, QIODevice.WriteOnly) data = QDataStream(ba, QIODevice.WriteOnly)
data.writeRawData('ABC') data.writeRawData('AB\x00C')
self.assertEqual(ba, 'ABC') self.assertEqual(ba.data(), 'AB\x00C')
data = QDataStream(ba) data = QDataStream(ba)
self.assertEqual(data.readRawData(4), 'ABC\x00') self.assertEqual(data.readRawData(4), 'AB\x00C')
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()