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/QtWebEngineCore | |
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/QtWebEngineCore')
-rw-r--r-- | sources/pyside2/tests/QtWebEngineCore/web_engine_custom_scheme.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sources/pyside2/tests/QtWebEngineCore/web_engine_custom_scheme.py b/sources/pyside2/tests/QtWebEngineCore/web_engine_custom_scheme.py index 2a110742a..8da2b45f8 100644 --- a/sources/pyside2/tests/QtWebEngineCore/web_engine_custom_scheme.py +++ b/sources/pyside2/tests/QtWebEngineCore/web_engine_custom_scheme.py @@ -34,6 +34,7 @@ from PySide2.QtCore import QBuffer, QTimer from PySide2.QtWidgets import QApplication from PySide2.QtWebEngineWidgets import QWebEngineView, QWebEngineProfile from PySide2.QtWebEngineCore import QWebEngineUrlSchemeHandler +import py3kcompat as py3k class TestSchemeHandler(QWebEngineUrlSchemeHandler): def requestStarted(self, request): @@ -42,16 +43,16 @@ class TestSchemeHandler(QWebEngineUrlSchemeHandler): return self.buffer = QBuffer() - self.buffer.setData("Really nice goodbye text.") + self.buffer.setData(py3k.b("Really nice goodbye text.")) self.buffer.aboutToClose.connect(self.buffer.deleteLater) - request.reply("text/plain;charset=utf-8", self.buffer) + request.reply(py3k.b("text/plain;charset=utf-8"), self.buffer) class MainTest(unittest.TestCase): def test_SchemeHandlerRedirect(self): app = QApplication([]) handler = TestSchemeHandler() profile = QWebEngineProfile.defaultProfile() - profile.installUrlSchemeHandler("testpy", handler) + profile.installUrlSchemeHandler(py3k.b("testpy"), handler) view = QWebEngineView() view.loadFinished.connect(app.quit) QTimer.singleShot(5000, app.quit) |