Mercurial Repositories > eric / changeset

--- a/QScintilla/Lexers/LexerBash.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerBash.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerBash(QsciLexerBash, Lexer):
+class LexerBash(Lexer, QsciLexerBash):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerBash.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "#"

--- a/QScintilla/Lexers/LexerBatch.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerBatch.py	Tue Apr 01 19:37:13 2014 +0200
@@ -12,7 +12,7 @@
 from .Lexer import Lexer
 
 
-class LexerBatch(QsciLexerBatch, Lexer):
+class LexerBatch(Lexer, QsciLexerBatch):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -22,7 +22,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerBatch.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "REM "

--- a/QScintilla/Lexers/LexerCMake.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerCMake.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerCMake(QsciLexerCMake, Lexer):
+class LexerCMake(Lexer, QsciLexerCMake):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerCMake.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "#"

--- a/QScintilla/Lexers/LexerCPP.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerCPP.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerCPP(QsciLexerCPP, Lexer):
+class LexerCPP(Lexer, QsciLexerCPP):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -25,7 +25,7 @@
         @param caseInsensitiveKeywords flag indicating keywords are case
             insensitive (boolean)
         """
-        super().__init__(parent, caseInsensitiveKeywords)
+        QsciLexerCPP.__init__(self, parent, caseInsensitiveKeywords)
         Lexer.__init__(self)
         
         self.commentString = "//"

--- a/QScintilla/Lexers/LexerCSS.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerCSS.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerCSS(QsciLexerCSS, Lexer):
+class LexerCSS(Lexer, QsciLexerCSS):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerCSS.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "#"

--- a/QScintilla/Lexers/LexerCSharp.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerCSharp.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerCSharp(QsciLexerCSharp, Lexer):
+class LexerCSharp(Lexer, QsciLexerCSharp):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerCSharp.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "//"

--- a/QScintilla/Lexers/LexerContainer.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerContainer.py	Tue Apr 01 19:37:13 2014 +0200
@@ -12,7 +12,7 @@
 from .Lexer import Lexer
 
 
-class LexerContainer(QsciLexer, Lexer):
+class LexerContainer(Lexer, QsciLexer):
     """
     Subclass as a base for the implementation of custom lexers.
     """
@@ -22,7 +22,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexer.__init__(self, parent)
         Lexer.__init__(self)
         
         self.editor = parent

--- a/QScintilla/Lexers/LexerD.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerD.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerD(QsciLexerD, Lexer):
+class LexerD(Lexer, QsciLexerD):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerD.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "//"

--- a/QScintilla/Lexers/LexerDiff.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerDiff.py	Tue Apr 01 19:37:13 2014 +0200
@@ -12,7 +12,7 @@
 from .Lexer import Lexer
 
 
-class LexerDiff(QsciLexerDiff, Lexer):
+class LexerDiff(Lexer, QsciLexerDiff):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -22,7 +22,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerDiff.__init__(self, parent)
         Lexer.__init__(self)
     
     def isCommentStyle(self, style):

--- a/QScintilla/Lexers/LexerFortran.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerFortran.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerFortran(QsciLexerFortran, Lexer):
+class LexerFortran(Lexer, QsciLexerFortran):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerFortran.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "!"

--- a/QScintilla/Lexers/LexerFortran77.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerFortran77.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerFortran77(QsciLexerFortran77, Lexer):
+class LexerFortran77(Lexer, QsciLexerFortran77):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerFortran77.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "c"

--- a/QScintilla/Lexers/LexerHTML.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerHTML.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerHTML(QsciLexerHTML, Lexer):
+class LexerHTML(Lexer, QsciLexerHTML):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerHTML.__init__(self, parent)
         Lexer.__init__(self)
         
         self.streamCommentString = {

--- a/QScintilla/Lexers/LexerIDL.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerIDL.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerIDL(QsciLexerIDL, Lexer):
+class LexerIDL(Lexer, QsciLexerIDL):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerIDL.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "//"

--- a/QScintilla/Lexers/LexerJava.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerJava.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerJava(QsciLexerJava, Lexer):
+class LexerJava(Lexer, QsciLexerJava):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerJava.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "//"

--- a/QScintilla/Lexers/LexerJavaScript.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerJavaScript.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerJavaScript(QsciLexerJavaScript, Lexer):
+class LexerJavaScript(Lexer, QsciLexerJavaScript):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerJavaScript.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "//"

--- a/QScintilla/Lexers/LexerLua.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerLua.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerLua(QsciLexerLua, Lexer):
+class LexerLua(Lexer, QsciLexerLua):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerLua.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "--"

--- a/QScintilla/Lexers/LexerMakefile.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerMakefile.py	Tue Apr 01 19:37:13 2014 +0200
@@ -12,7 +12,7 @@
 from .Lexer import Lexer
 
 
-class LexerMakefile(QsciLexerMakefile, Lexer):
+class LexerMakefile(Lexer, QsciLexerMakefile):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -22,7 +22,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerMakefile.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "#"

--- a/QScintilla/Lexers/LexerMatlab.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerMatlab.py	Tue Apr 01 19:37:13 2014 +0200
@@ -12,7 +12,7 @@
 from .Lexer import Lexer
 
 
-class LexerMatlab(QsciLexerMatlab, Lexer):
+class LexerMatlab(Lexer, QsciLexerMatlab):
     """
     Subclass to implement some additional lexer dependent methods.
     """
@@ -22,7 +22,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerMatlab.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "%~"

--- a/QScintilla/Lexers/LexerOctave.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerOctave.py	Tue Apr 01 19:37:13 2014 +0200
@@ -12,7 +12,7 @@
 from .Lexer import Lexer
 
 
-class LexerOctave(QsciLexerOctave, Lexer):
+class LexerOctave(Lexer, QsciLexerOctave):
     """
     Subclass to implement some additional lexer dependent methods.
     """
@@ -22,7 +22,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerOctave.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "#"

--- a/QScintilla/Lexers/LexerPOV.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerPOV.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerPOV(QsciLexerPOV, Lexer):
+class LexerPOV(Lexer, QsciLexerPOV):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerPOV.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "//"

--- a/QScintilla/Lexers/LexerPascal.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerPascal.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerPascal(QsciLexerPascal, Lexer):
+class LexerPascal(Lexer, QsciLexerPascal):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerPascal.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "//"

--- a/QScintilla/Lexers/LexerPerl.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerPerl.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerPerl(QsciLexerPerl, Lexer):
+class LexerPerl(Lexer, QsciLexerPerl):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerPerl.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "#"

--- a/QScintilla/Lexers/LexerPostScript.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerPostScript.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerPostScript(QsciLexerPostScript, Lexer):
+class LexerPostScript(Lexer, QsciLexerPostScript):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerPostScript.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "%"

--- a/QScintilla/Lexers/LexerProperties.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerProperties.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerProperties(QsciLexerProperties, Lexer):
+class LexerProperties(Lexer, QsciLexerProperties):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerProperties.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "#"

--- a/QScintilla/Lexers/LexerPython.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerPython.py	Tue Apr 01 19:37:13 2014 +0200
@@ -15,7 +15,7 @@
 import Preferences
 
 
-class LexerPython(QsciLexerPython, Lexer):
+class LexerPython(Lexer, QsciLexerPython):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -26,7 +26,7 @@
         @param variant name of the language variant (string)
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerPython.__init__(self, parent)
         Lexer.__init__(self)
         
         self.variant = variant

--- a/QScintilla/Lexers/LexerRuby.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerRuby.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerRuby(QsciLexerRuby, Lexer):
+class LexerRuby(Lexer, QsciLexerRuby):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerRuby.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "#"

--- a/QScintilla/Lexers/LexerSQL.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerSQL.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerSQL(QsciLexerSQL, Lexer):
+class LexerSQL(Lexer, QsciLexerSQL):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerSQL.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "--"

--- a/QScintilla/Lexers/LexerTCL.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerTCL.py	Tue Apr 01 19:37:13 2014 +0200
@@ -14,7 +14,7 @@
 import Preferences
 
 
-class LexerTCL(QsciLexerTCL, Lexer):
+class LexerTCL(Lexer, QsciLexerTCL):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -24,7 +24,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerTCL.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "#"

--- a/QScintilla/Lexers/LexerTeX.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerTeX.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerTeX(QsciLexerTeX, Lexer):
+class LexerTeX(Lexer, QsciLexerTeX):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerTeX.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "%"

--- a/QScintilla/Lexers/LexerVHDL.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerVHDL.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerVHDL(QsciLexerVHDL, Lexer):
+class LexerVHDL(Lexer, QsciLexerVHDL):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerVHDL.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "--"

--- a/QScintilla/Lexers/LexerXML.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerXML.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerXML(QsciLexerXML, Lexer):
+class LexerXML(Lexer, QsciLexerXML):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerXML.__init__(self, parent)
         Lexer.__init__(self)
         
         self.streamCommentString = {

--- a/QScintilla/Lexers/LexerYAML.py	Tue Apr 01 19:22:33 2014 +0200
+++ b/QScintilla/Lexers/LexerYAML.py	Tue Apr 01 19:37:13 2014 +0200
@@ -13,7 +13,7 @@
 import Preferences
 
 
-class LexerYAML(QsciLexerYAML, Lexer):
+class LexerYAML(Lexer, QsciLexerYAML):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -23,7 +23,7 @@
         
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        QsciLexerYAML.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "---"