Handle Qsci import for PyQt 4-6 bindings

Author: MHendricks

preditor/scintilla/__init__.py

@@ -1,5 +1,23 @@
 from __future__ import absolute_import
 
+__all__ = ["delayables", "FindState", "Qsci", "QsciScintilla"]
+
+import Qt
+
+if Qt.IsPyQt6:
+    from PyQt6 import Qsci
+    from PyQt6.Qsci import QsciScintilla
+elif Qt.IsPyQt5:
+    from PyQt5 import Qsci
+    from PyQt5.Qsci import QsciScintilla
+elif Qt.IsPyQt4:
+    from PyQt4 import Qsci
+    from PyQt4.Qsci import QsciScintilla
+else:
+    raise ImportError(
+        "QScintilla library is not supported by {}".format(Qt.__binding__)
+    )
+
 
 class FindState(object):
     """
@@ -19,4 +37,4 @@ def __init__(self):
         self.end_pos = None
 
 
-from . import delayables  # noqa: F401, E402
+from . import delayables  # noqa: E402

preditor/scintilla/delayables/smart_highlight.py

@@ -1,12 +1,11 @@
 from __future__ import absolute_import, print_function
 
 import Qt
-from PyQt5.Qsci import QsciScintilla
 from Qt.QtCore import QSignalMapper
 from Qt.QtWidgets import QWidget
 
 from ...delayable_engine.delayables import SearchDelayable
-from .. import FindState
+from .. import FindState, QsciScintilla
 
 
 class SmartHighlight(SearchDelayable):

preditor/scintilla/delayables/spell_check.py

@@ -4,12 +4,11 @@
 import re
 import string
 
-from PyQt5.Qsci import QsciScintilla
 from Qt.QtCore import Qt
 from Qt.QtGui import QColor
 
 from ...delayable_engine.delayables import RangeDelayable
-from .. import lang
+from .. import QsciScintilla, lang
 
 logger = logging.getLogger(__name__)
 

preditor/scintilla/documenteditor.py

@@ -20,7 +20,6 @@
 from functools import partial
 
 import six
-from PyQt5.Qsci import QsciScintilla
 from PyQt5.QtCore import QTextCodec
 from Qt import QtCompat
 from Qt.QtCore import Property, QFile, QPoint, Qt, Signal
@@ -38,7 +37,7 @@
 from ..delayable_engine import DelayableEngine
 from ..enum import Enum, EnumGroup
 from ..gui import QtPropertyInit
-from . import lang
+from . import QsciScintilla, lang
 
 logger = logging.getLogger(__name__)
 

preditor/scintilla/lang/language.py

@@ -8,7 +8,7 @@
 except ImportError:
     from ConfigParser import ConfigParser
 
-from PyQt5 import Qsci
+from .. import Qsci
 
 
 class MethodDescriptor(object):

preditor/scintilla/lexers/cpplexer.py

@@ -1,10 +1,11 @@
 from __future__ import absolute_import
 
-from PyQt5.Qsci import QsciLexerCPP
 from Qt.QtGui import QColor
 
+from .. import Qsci
 
-class CppLexer(QsciLexerCPP):
+
+class CppLexer(Qsci.QsciLexerCPP):
     # Items in this list will be highlighted using the color for self.KeywordSet2
     highlightedKeywords = ''
 

preditor/scintilla/lexers/javascriptlexer.py

@@ -1,10 +1,11 @@
 from __future__ import absolute_import
 
-from PyQt5.Qsci import QsciLexerJavaScript
 from Qt.QtGui import QColor
 
+from .. import Qsci
 
-class JavaScriptLexer(QsciLexerJavaScript):
+
+class JavaScriptLexer(Qsci.QsciLexerJavaScript):
     # Items in this list will be highlighted using the color for self.KeywordSet2
     highlightedKeywords = ''
 

preditor/scintilla/lexers/maxscriptlexer.py

@@ -4,7 +4,8 @@
 from builtins import str as text
 
 from future.utils import iteritems
-from PyQt5.Qsci import QsciLexerCustom, QsciScintilla
+
+from .. import Qsci, QsciScintilla
 
 MS_KEYWORDS = """
 if then else not and or key collect
@@ -17,12 +18,12 @@
 """
 
 
-class MaxscriptLexer(QsciLexerCustom):
+class MaxscriptLexer(Qsci.QsciLexerCustom):
     # Items in this list will be highligheded using the color for self.SmartHighlight
     highlightedKeywords = ''
 
     def __init__(self, parent=None):
-        QsciLexerCustom.__init__(self, parent)
+        super(MaxscriptLexer, self).__init__(parent)
         self._styles = {
             0: 'Default',
             1: 'Comment',
@@ -56,7 +57,7 @@ def defaultColor(self, style):
         elif style == self.String:
             return QColor(180, 140, 30)
 
-        return QsciLexerCustom.defaultColor(self, style)
+        return super(MaxscriptLexer, self).defaultColor(style)
 
     def defaultPaper(self, style):
         if style == self.SmartHighlight:
@@ -77,7 +78,7 @@ def keywords(self, style):
             return MS_KEYWORDS
         if style == self.SmartHighlight:
             return self.highlightedKeywords
-        return QsciLexerCustom.keywords(self, style)
+        return super(MaxscriptLexer, self).keywords(style)
 
     def processChunk(self, chunk, lastState, keywords):
         # process the length of the chunk

preditor/scintilla/lexers/mellexer.py

@@ -2,9 +2,10 @@
 
 import re
 
-from PyQt5.Qsci import QsciLexerCPP
 from Qt.QtGui import QColor
 
+from .. import Qsci
+
 MEL_SYNTAX = """and array as case catch continue do else exit float for from global if
 in int local not of off on or proc random return select string then throw to try vector
 when where while with true false
@@ -310,7 +311,7 @@
 """
 
 
-class MelLexer(QsciLexerCPP):
+class MelLexer(Qsci.QsciLexerCPP):
     # Items in this list will be highlighted using the color for self.GlobalClass
     _highlightedKeywords = ''
     # Mel uses $varName for variables, so we have to allow them in words

preditor/scintilla/lexers/mulexer.py

@@ -1,14 +1,15 @@
 from __future__ import absolute_import
 
-from PyQt5.Qsci import QsciLexerCPP
 from Qt.QtGui import QColor
 
+from .. import Qsci
+
 MU_KEYWORDS = """
 method string Color use require module for_each let global function nil void
 """
 
 
-class MuLexer(QsciLexerCPP):
+class MuLexer(Qsci.QsciLexerCPP):
     # Items in this list will be highlighted using the color for self.KeywordSet2
     highlightedKeywords = ''