diff options
author | Boxiang Sun <daetalusun@gmail.com> | 2018-05-20 11:04:45 +0800 |
---|---|---|
committer | Boxiang Sun <daetalusun@gmail.com> | 2018-06-01 15:09:19 +0000 |
commit | ee8e7117c79f6820cb228e0f0da522ce7d3c1dce (patch) | |
tree | 13cd0847be4ff45a80e2457b945f86b9bd9b4a20 /sources/pyside2/tests/QtGui | |
parent | ddbd93680730811a5020b4d429c2e3e11d6823e3 (diff) |
Improve the QByteArray implementation
The available constructors for QByteArray are now:
bytes, bytearray, and QByteArray, unicode is not
accepted anymore.
Also the concatenation is now possible between QByteArrays.
Even though is not possible to initialize a QByteArray
with an unicode, we include the possibility to compare it with
one (Compatibility with PyQt).
The __repr__ and __str__ are now properly working.
There seemed to be a confusion regarding data types between
Shiboken, Python2 and Python3 related to bytes,
so now the structure is based on the flag SBK_BYTES_NAME,
which is define as "bytes" for Python3 and "str" for Python2.
Many tests were modified to properly handle string,
using the `py3kcompat` module.
Task-number: PYSIDE-232
Change-Id: I8b671f367c60a0870c72dcbe5662106b3225037d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/pyside2/tests/QtGui')
-rw-r--r-- | sources/pyside2/tests/QtGui/bug_660.py | 2 | ||||
-rw-r--r-- | sources/pyside2/tests/QtGui/qtextdocumentwriter_test.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sources/pyside2/tests/QtGui/bug_660.py b/sources/pyside2/tests/QtGui/bug_660.py index a5fc5be91..e19835a3a 100644 --- a/sources/pyside2/tests/QtGui/bug_660.py +++ b/sources/pyside2/tests/QtGui/bug_660.py @@ -42,7 +42,7 @@ class MyItemModel(QStandardItemModel): def mimeData(self,indexes): self.__mimedata = super(MyItemModel,self).mimeData(indexes) - self.__mimedata.setData(py3k.unicode_('application/my-form'), 'hi') + self.__mimedata.setData(py3k.unicode_('application/my-form'), py3k.b('hi')) return self.__mimedata class TestBug660(unittest.TestCase): diff --git a/sources/pyside2/tests/QtGui/qtextdocumentwriter_test.py b/sources/pyside2/tests/QtGui/qtextdocumentwriter_test.py index c5166ca18..b9d87ff2b 100644 --- a/sources/pyside2/tests/QtGui/qtextdocumentwriter_test.py +++ b/sources/pyside2/tests/QtGui/qtextdocumentwriter_test.py @@ -30,6 +30,7 @@ import unittest from PySide2.QtGui import QTextDocumentWriter, QTextDocument from PySide2.QtCore import QBuffer +import py3kcompat as py3k class QTextDocumentWriterTest(unittest.TestCase): @@ -38,7 +39,7 @@ class QTextDocumentWriterTest(unittest.TestCase): doc = QTextDocument(text) b = QBuffer() b.open(QBuffer.ReadWrite) - writer = QTextDocumentWriter(b, "plaintext"); + writer = QTextDocumentWriter(b, py3k.b("plaintext")); writer.write(doc); b.close() self.assertEqual(b.buffer(), text) |