From c77dbd1ae3582993998fd4de7e5ebe952c280556 Mon Sep 17 00:00:00 2001 From: Rafael Laverde Date: Wed, 18 Jan 2017 12:19:47 -0500 Subject: [PATCH 1/3] Use QRegularExpression only if PYQT_VERSION >= 5.5 (see isuue #3989) --- spyder/widgets/mixins.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spyder/widgets/mixins.py b/spyder/widgets/mixins.py index 269d533b112..d10d5f8ac69 100644 --- a/spyder/widgets/mixins.py +++ b/spyder/widgets/mixins.py @@ -22,9 +22,11 @@ from qtpy.QtCore import QPoint, Qt from qtpy.QtGui import QCursor, QTextCursor, QTextDocument from qtpy.QtWidgets import QApplication, QToolTip -from qtpy import PYQT5 +from qtpy import PYQT_VERSION -if PYQT5: +PYQT55_VERSION = tuple(int(x) for x in PYQT_VERSION.split('.')) >= (5, 5) + +if PYQT55_VERSION: from qtpy.QtCore import QRegularExpression else: from qtpy.QtCore import QRegExp @@ -490,7 +492,7 @@ def find_text(self, text, changed=True, forward=True, case=False, moves += [QTextCursor.End] if not regexp: text = re.escape(to_text_string(text)) - if PYQT5: + if PYQT55_VERSION: pattern = QRegularExpression(r"\b{}\b".format(text) if words else text) if case: From 51ecdf9878267bb93a110d4ff25097bf3da08bb7 Mon Sep 17 00:00:00 2001 From: Rafael Laverde Date: Thu, 19 Jan 2017 10:36:18 -0500 Subject: [PATCH 2/3] Use QT_VERSION instead of PYQT_VERSION when checking for QT5.5 --- spyder/widgets/mixins.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spyder/widgets/mixins.py b/spyder/widgets/mixins.py index d10d5f8ac69..ae48bbae6a3 100644 --- a/spyder/widgets/mixins.py +++ b/spyder/widgets/mixins.py @@ -22,11 +22,11 @@ from qtpy.QtCore import QPoint, Qt from qtpy.QtGui import QCursor, QTextCursor, QTextDocument from qtpy.QtWidgets import QApplication, QToolTip -from qtpy import PYQT_VERSION +from qtpy import QT_VERSION -PYQT55_VERSION = tuple(int(x) for x in PYQT_VERSION.split('.')) >= (5, 5) +QT55_VERSION = tuple(int(x) for x in QT_VERSION.split('.')) >= (5, 5) -if PYQT55_VERSION: +if QT55_VERSION: from qtpy.QtCore import QRegularExpression else: from qtpy.QtCore import QRegExp @@ -492,7 +492,7 @@ def find_text(self, text, changed=True, forward=True, case=False, moves += [QTextCursor.End] if not regexp: text = re.escape(to_text_string(text)) - if PYQT55_VERSION: + if QT55_VERSION: pattern = QRegularExpression(r"\b{}\b".format(text) if words else text) if case: From 88074671a97595d4c5599d93b6e3cdccb367c4f5 Mon Sep 17 00:00:00 2001 From: Rafael Laverde Date: Fri, 20 Jan 2017 09:38:48 -0500 Subject: [PATCH 3/3] Use check_version for comparing if version is greater than QT5.5. --- spyder/widgets/mixins.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/spyder/widgets/mixins.py b/spyder/widgets/mixins.py index ae48bbae6a3..97b283734c7 100644 --- a/spyder/widgets/mixins.py +++ b/spyder/widgets/mixins.py @@ -24,22 +24,21 @@ from qtpy.QtWidgets import QApplication, QToolTip from qtpy import QT_VERSION -QT55_VERSION = tuple(int(x) for x in QT_VERSION.split('.')) >= (5, 5) - -if QT55_VERSION: - from qtpy.QtCore import QRegularExpression -else: - from qtpy.QtCore import QRegExp - # Local imports from spyder.config.base import _ from spyder.py3compat import is_text_string, to_text_string, u -from spyder.utils import encoding, sourcecode +from spyder.utils import encoding, sourcecode, programs from spyder.utils.dochelpers import (getargspecfromtext, getobj, getsignaturefromtext) from spyder.utils.misc import get_error_match from spyder.widgets.arraybuilder import NumpyArrayDialog +QT55_VERSION = programs.check_version(QT_VERSION, "5.5", ">=") + +if QT55_VERSION: + from qtpy.QtCore import QRegularExpression +else: + from qtpy.QtCore import QRegExp HISTORY_FILENAMES = []