diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-06-07 11:17:32 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-06-07 11:17:37 +0200 |
commit | 60a3b6a16304af4b1d8896a06b8407fe49f80ed2 (patch) | |
tree | 6dca986c5e439c7cb39b17643129dadb436d2fea /sources/pyside2/tests/QtGui | |
parent | 33943b54e9470dc8830e94270e6521524acb2954 (diff) | |
parent | 823eea34b77ca16a545a75b55619a5ed4da38c0e (diff) |
Merge branch '5.9' into 5.11
Change-Id: I2de0fe8456fca242c56ea28520126f9ebbf540d8
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) |