From 00ce4800d9b33b37eb03db6b2566498620f719d6 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 1 Oct 2018 20:29:11 +0200 Subject: [PATCH] Fix compatibility with PyQt5 5.11.3 --- CHANGELOG.rst | 5 +++++ pytestqt/qt_compat.py | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2c456cbd..820ce511 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,8 @@ +3.2.1 (2018-10-01) +------------------ + +- Fixed compatibility with PyQt5 5.11.3 + 3.2.0 (2018-09-26) ------------------ diff --git a/pytestqt/qt_compat.py b/pytestqt/qt_compat.py index a3887ce1..2cc144ce 100644 --- a/pytestqt/qt_compat.py +++ b/pytestqt/qt_compat.py @@ -114,13 +114,13 @@ def _import_module(module_name): self.Qt = QtCore.Qt self.QEvent = QtCore.QEvent - # qInfo is not exposed in PyQt5 and PySide2 bindings (#232) - assert not hasattr( - QtCore, "qInfo" - ) # lets break hard so we know when qInfo gets exposed - self.qInfo = None + # qInfo is not exposed in PySide2 (#232) if hasattr(QtCore, "QMessageLogger"): self.qInfo = lambda msg: QtCore.QMessageLogger().info(msg) + elif hasattr(QtCore, "qInfo"): + self.qInfo = QtCore.qInfo + else: + self.qInfo = None self.qDebug = QtCore.qDebug self.qWarning = QtCore.qWarning self.qCritical = QtCore.qCritical