eric: comparison Plugins/CheckerPlugins/Pep8/Pep8Dialog.py

-:affc66a603c7
+:e5115553185a
 from __future__ import unicode_literals    # __IGNORE_WARNING__
 import os
 import fnmatch
+import tokenize
 from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QDialog, QTreeWidgetItem, QAbstractButton, \
 QDialogButtonBox, QApplication, QHeaderView
 itm.setData(0, self.filenameRole, file)
 itm.setData(0, self.lineRole, int(line))
 itm.setData(0, self.positionRole, int(pos))
 itm.setData(0, self.messageRole, message)
+def __createErrorItem(self, file, line, pos, message):
+"""
+Private method to create an entry in the result list.
+@param file file name of the file (string)
+@param line line number of issue (integer or string)
+@param pos character position of issue (integer or string)
+@param message message text (string)
+@param fixed flag indicating a fixed issue (boolean)
+"""
+if self.__lastFileItem is None:
+# It's a new file
+self.__lastFileItem = QTreeWidgetItem(self.resultList, [file])
+self.__lastFileItem.setFirstColumnSpanned(True)
+self.__lastFileItem.setExpanded(True)
+self.__lastFileItem.setData(0, self.filenameRole, file)
+itm = QTreeWidgetItem(self.__lastFileItem,
+["{0:6}".format(line), '', message])
+itm.setIcon(0, UI.PixmapCache.getIcon("syntaxError.png"))
+itm.setTextAlignment(0, Qt.AlignRight)
+itm.setTextAlignment(1, Qt.AlignHCenter)
+itm.setTextAlignment(0, Qt.AlignVCenter)
+itm.setTextAlignment(1, Qt.AlignVCenter)
+itm.setTextAlignment(2, Qt.AlignVCenter)
+itm.setData(0, self.filenameRole, file)
+itm.setData(0, self.lineRole, int(line))
+itm.setData(0, self.positionRole, int(pos))
+itm.setData(0, self.messageRole, message)
 def __updateStatistics(self, statistics, fixer):
 """
 Private method to update the collected statistics.
 @param statistics dictionary of statistical data with
 if isinstance(fn, list):
 files = fn[:]
 elif os.path.isdir(fn):
 files = []
-for ext in Preferences.getPython("Python3Extensions"):
+extensions = set(Preferences.getPython("PythonExtensions") +
-files.extend(
+Preferences.getPython("Python3Extensions"))
-Utilities.direntries(fn, 1, '*{0}'.format(ext), 0))
+for ext in extensions:
-for ext in Preferences.getPython("PythonExtensions"):
+files.extend(Utilities.direntries(fn, True, '*{0}'.format(ext), 0))
-files.extend(
-Utilities.direntries(fn, 1, '*{0}'.format(ext), 0))
 else:
 files = [fn]
 # filter the list depending on the filter string
 if files:
 for filter in filterList:
 files = \
 [f for f in files
 if not fnmatch.fnmatch(f, filter.strip())]
-py3files = [f for f in files \
+if len(files) > 0:
-if f.endswith(
+self.checkProgress.setMaximum(len(files))
-tuple(Preferences.getPython("Python3Extensions")))]
-py2files = [f for f in files \
-if f.endswith(
-tuple(Preferences.getPython("PythonExtensions")))]
-if len(py3files) + len(py2files) > 0:
-self.checkProgress.setMaximum(len(py3files) + len(py2files))
 QApplication.processEvents()
 # extract the configuration values
 excludeMessages = self.excludeMessagesEdit.text()
 includeMessages = self.includeMessagesEdit.text()
 self.resultList.setUpdatesEnabled(False)
 self.resultList.setSortingEnabled(False)
 # now go through all the files
 progress = 0
-for file in py3files + py2files:
+for file in files:
 self.checkProgress.setValue(progress)
 QApplication.processEvents()
 if self.cancelled:
 self.__resort()
 try:
 source, encoding = Utilities.readEncodedFile(file)
 source = source.splitlines(True)
 except (UnicodeError, IOError) as msg:
 self.noResults = False
-self.__createResultItem(file, "1", "1",
+self.__createResultItem(file, 1, 1,
 self.trUtf8("Error: {0}").format(str(msg))\
 .rstrip()[1:-1], False)
 progress += 1
 continue
-flags = Utilities.extractFlags(source)
-ext = os.path.splitext(file)[1]
 if fixIssues:
 from .Pep8Fixer import Pep8Fixer
 fixer = Pep8Fixer(self.__project, file, source,
 fixCodes, True)  # always fix in place
 else:
 fixer = None
-if ("FileType" in flags and
+from .Pep8Checker import Pep8Checker
-flags["FileType"] in ["Python", "Python2"]) or \
+checker = Pep8Checker(file, source,
-file in py2files or \
+repeat=repeatMessages,
-(ext in [".py", ".pyw"] and \
+select=includeMessages,
-Preferences.getProject("DeterminePyFromProject") and \
+ignore=excludeMessages)
-self.__project.isOpen() and \
+try:
-self.__project.isProjectFile(file) and \
+checker.check_all()
-self.__project.getProjectLanguage() in ["Python",
+except tokenize.TokenError as msg:
-"Python2"]):
+self.noResults = False
-from .Pep8Checker import Pep8Py2Checker
+self.__createErrorItem(file, 1, -1,
-checker = Pep8Py2Checker(file, [],
+self.trUtf8("Token Error: {0}".format(str(msg))))
-repeat=repeatMessages,
+except IndentationError as err:
-select=includeMessages,
+self.noResults = False
-ignore=excludeMessages)
+self.__createErrorItem(file, err.lineno, -1,
+self.trUtf8("Indentation Error: {0}".format(str(err.msg))))
+except Exception as err:
+self.noResults = False
+self.__createErrorItem(file, 1, -1,
+self.trUtf8("Unspecific Error: {0}".format(str(err))))
 else:
-from .Pep8Checker import Pep8Checker
+checker.messages.sort(key=lambda a: a[1])
-checker = Pep8Checker(file, source,
+for message in checker.messages:
-repeat=repeatMessages,
+fname, lineno, position, text = message
-select=includeMessages,
+if "__IGNORE_WARNING__" not in Utilities.extractLineFlags(
-ignore=excludeMessages)
+source[lineno - 1].strip()):
-checker.check_all()
+self.noResults = False
-checker.messages.sort(key=lambda a: a[1])
+fixed = False
-for message in checker.messages:
+if fixer:
-fname, lineno, position, text = message
+fixed, msg = fixer.fixIssue(lineno, position, text)
-if "__IGNORE_WARNING__" not in Utilities.extractLineFlags(
+if fixed:
-source[lineno - 1].strip()):
+text += "\n" + \
-self.noResults = False
+self.trUtf8("Fix: {0}").format(msg)
-fixed = False
+self.__createResultItem(
-if fixer:
+fname, lineno, position, text, fixed)
-fixed, msg = fixer.fixIssue(lineno, position, text)
+if fixer:
-if fixed:
+fixer.saveFile(encoding)
-text += "\n" + \
+self.__updateStatistics(checker.statistics, fixer)
-self.trUtf8("Fix: {0}").format(msg)
+finally:
-self.__createResultItem(
+progress += 1
-fname, lineno, position, text, fixed)
-fixer and fixer.saveFile(encoding)
-self.__updateStatistics(checker.statistics, fixer)
-progress += 1
 finally:
 # reenable updates of the list
 self.resultList.setSortingEnabled(True)
 self.resultList.setUpdatesEnabled(True)
 self.checkProgress.setValue(progress)
 vm = e5App().getObject("ViewManager")
 vm.openSourceFile(fn, lineno=lineno, pos=position)
 editor = vm.getOpenEditor(fn)
-editor.toggleFlakesWarning(lineno, True, message)
+if position > 0:
+editor.toggleFlakesWarning(lineno, True, message)
+else:
+error = message.split(':', 1)[-1]
+editor.toggleSyntaxError(lineno, 1, True, error.strip(), show=True)
 @pyqtSlot()
 def on_showButton_clicked(self):
 """
 Private slot to handle the "Show" button press.

Mercurial Repositories > eric / file comparison

comparison: Plugins/CheckerPlugins/Pep8/Pep8Dialog.py

Plugins/CheckerPlugins/Pep8/Pep8Dialog.py