Sun, 06 Jul 2014 17:01:48 +0200
Fixed an issue that made it incompatible to eric 5.4.x.
ChangeLog | file | annotate | diff | comparison | revisions | |
PluginPyLint.py | file | annotate | diff | comparison | revisions | |
PluginPyLint.zip | file | annotate | diff | comparison | revisions | |
PyLint/PyLintExecDialog.py | file | annotate | diff | comparison | revisions |
--- a/ChangeLog Sun Jul 06 16:27:51 2014 +0200 +++ b/ChangeLog Sun Jul 06 17:01:48 2014 +0200 @@ -1,5 +1,8 @@ ChangeLog --------- +Version 5.4.2: +- bug fixes + Version 5.4.1: - bug fixes
--- a/PluginPyLint.py Sun Jul 06 16:27:51 2014 +0200 +++ b/PluginPyLint.py Sun Jul 06 17:01:48 2014 +0200 @@ -42,7 +42,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "5.4.1" +version = "5.4.2" className = "PyLintPlugin" packageName = "PyLint" shortDescription = "Show the PyLint dialogs." @@ -538,7 +538,7 @@ # now do the call from PyLint.PyLintExecDialog import PyLintExecDialog - dlg2 = PyLintExecDialog() + dlg2 = PyLintExecDialog(self.__ui) reportFile = parms.get('reportFile', None) res = dlg2.start(args, mpName, reportFile, project.getProjectPath())
--- a/PyLint/PyLintExecDialog.py Sun Jul 06 16:27:51 2014 +0200 +++ b/PyLint/PyLintExecDialog.py Sun Jul 06 17:01:48 2014 +0200 @@ -37,15 +37,18 @@ """ filenameRole = Qt.UserRole + 1 - def __init__(self, parent=None): + def __init__(self, ui, parent=None): """ Constructor + @param ui reference to the main window (UI.UserInterface) @param parent parent widget of this dialog (QWidget) """ QWidget.__init__(self, parent) self.setupUi(self) + self.__ui = ui + self.saveButton = self.buttonBox.addButton( self.trUtf8("Save Report..."), QDialogButtonBox.ActionRole) self.saveButton.setToolTip( @@ -343,9 +346,14 @@ vm = e5App().getObject("ViewManager") vm.openSourceFile(fn, lineno) editor = vm.getOpenEditor(fn) - editor.toggleWarning( - lineno, True, - "{0} | {1}".format(itm.text(1), itm.text(2))) + if self.__ui.versionIsNewer("5.4.99", "20140101"): + editor.toggleWarning( + lineno, 0, True, + "{0} | {1}".format(itm.text(1), itm.text(2))) + else: + editor.toggleWarning( + lineno, True, + "{0} | {1}".format(itm.text(1), itm.text(2))) else: fn = os.path.join(self.pathname, itm.data(0, self.filenameRole)) vm = e5App().getObject("ViewManager") @@ -354,9 +362,14 @@ for index in range(itm.childCount()): citm = itm.child(index) lineno = int(citm.text(0)) - editor.toggleWarning( - lineno, True, - "{0} | {1}".format(citm.text(1), citm.text(2))) + if self.__ui.versionIsNewer("5.4.99", "20140101"): + editor.toggleWarning( + lineno, 0, True, + "{0} | {1}".format(citm.text(1), citm.text(2))) + else: + editor.toggleWarning( + lineno, True, + "{0} | {1}".format(citm.text(1), citm.text(2))) def __writeReport(self): """