eric: comparison Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py

-:b3280ade94a6
+:6caa4436dee2
 def __resort(self):
 """
 Private method to resort the tree.
 """
 self.resultList.sortItems(self.resultList.sortColumn(),
-self.resultList.header().sortIndicatorOrder())
+self.resultList.header().sortIndicatorOrder()
+)
-def __createResultItem(self, file, line, error, sourcecode, isWarning = False):
+def __createResultItem(self, file, line, error, sourcecode,
+isWarning = False):
 """
 Private method to create an entry in the result list.
 @param file filename of file (string)
 @param line linenumber of faulty source (integer or string)
 if isinstance(fn, list):
 files = fn
 elif os.path.isdir(fn):
 files = []
 for ext in Preferences.getPython("Python3Extensions"):
-files.extend(Utilities.direntries(fn, 1, '*{0}'.format(ext), 0))
+files.extend(
+Utilities.direntries(fn, 1, '*{0}'.format(ext), 0))
 for ext in Preferences.getPython("PythonExtensions"):
-files.extend(Utilities.direntries(fn, 1, '*{0}'.format(ext), 0))
+files.extend(
+Utilities.direntries(fn, 1, '*{0}'.format(ext), 0))
 else:
 files = [fn]
-files = [f for f in files \
+py3files = [f for f in files \
-if f.endswith(tuple(Preferences.getPython("Python3Extensions")))]
+if f.endswith(
+tuple(Preferences.getPython("Python3Extensions")))]
 py2files = [f for f in files \
-if f.endswith(tuple(Preferences.getPython("PythonExtensions")))]
+if f.endswith(
+tuple(Preferences.getPython("PythonExtensions")))]
-if (codestring and len(files) == 1) or \
+if (codestring and len(py3files) == 1) or \
 (codestring and len(py2files) == 1) or \
-(not codestring and len(files) + len(py2files) > 0):
+(not codestring and len(py3files) + len(py2files) > 0):
-self.checkProgress.setMaximum(len(files) + len(py2files))
+self.checkProgress.setMaximum(len(py3files) + len(py2files))
 QApplication.processEvents()
-ignoreStarImportWarnings = Preferences.getFlakes("IgnoreStarImportWarnings")
+ignoreStarImportWarnings = \
+Preferences.getFlakes("IgnoreStarImportWarnings")
 # now go through all the files
 progress = 0
-for file in files + py2files:
+for file in py3files + py2files:
 self.checkProgress.setValue(progress)
 QApplication.processEvents()
 self.__resort()
 if self.cancelled:
 # convert eols
 source = Utilities.convertLineEnds(source, "\n")
 except (UnicodeError, IOError) as msg:
 self.noResults = False
 self.__createResultItem(file, "1",
-"Error: {0}".format(str(msg)).rstrip()[1:-1], "")
+self.trUtf8("Error: {0}").format(str(msg))\
+.rstrip()[1:-1], "")
 progress += 1
 continue
 flags = Utilities.extractFlags(source)
 ext = os.path.splitext(file)[1]
 file in py2files or \
 (ext in [".py", ".pyw"] and \
 Preferences.getProject("DeterminePyFromProject") and \
 self.__project.isOpen() and \
 self.__project.isProjectFile(file) and \
-self.__project.getProjectLanguage() in ["Python", "Python2"]):
+self.__project.getProjectLanguage() in ["Python",
+"Python2"]):
 isPy3 = False
 nok, fname, line, code, error, warnings = \
 Utilities.py2compile(file,
-checkFlakes = Preferences.getFlakes("IncludeInSyntaxCheck"))
+checkFlakes = \
+Preferences.getFlakes("IncludeInSyntaxCheck"))
 else:
 isPy3 = True
-nok, fname, line, code, error = Utilities.compile(file, source)
+nok, fname, line, code, error = \
+Utilities.compile(file, source)
 if nok:
 self.noResults = False
 self.__createResultItem(fname, line, error, code)
 else:
 if Preferences.getFlakes("IncludeInSyntaxCheck"):
 warnings.messages.sort(key = lambda a: a.lineno)
 for warning in warnings.messages:
 if ignoreStarImportWarnings and \
 isinstance(warning, ImportStarUsed):
 continue
-fname, lineno, message = warning.getMessageData()
+fname, lineno, message = \
+warning.getMessageData()
 if not sourceLines[lineno - 1].strip()\
 .endswith("__IGNORE_WARNING__"):
 self.noResults = False
-self.__createResultItem(fname, lineno, message,
+self.__createResultItem(
-"", isWarning = True)
+fname, lineno, message, "",
+isWarning = True)
 except SyntaxError as err:
 if err.text.strip():
 msg = err.text.strip()
 else:
 msg = err.msg
-self.__createResultItem(err.filename, err.lineno, msg, "")
+self.__createResultItem(
+err.filename, err.lineno, msg, "")
 else:
 for warning in warnings:
 self.noResults = False
-self.__createResultItem(warning[0], int(warning[1]),
+self.__createResultItem(
-warning[2], "", isWarning = True)
+warning[0], int(warning[1]),
+warning[2], "", isWarning = True)
 progress += 1
 self.checkProgress.setValue(progress)
 QApplication.processEvents()
 self.__resort()
 else:
 self.checkProgress.setValue(1)
 self.__finish()
 def __finish(self):
 """
-Private slot called when the syntax check finished or the user pressed the button.
+Private slot called when the syntax check finished or the user
+pressed the button.
 """
 self.cancelled = True
 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
 self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
 self.on_showButton_clicked()
 @pyqtSlot()
 def on_startButton_clicked(self):
 """
-Private slot to start a code metrics run.
+Private slot to start a syntax check run.
 """
 fileList = self.__fileList[:]
 filterString = self.excludeFilesEdit.text()
 if "ExcludeFiles" not in self.__data or \
 filterString != self.__data["ExcludeFiles"]:
 self.__data["ExcludeFiles"] = filterString
-self.__project.setData("CHECKERSPARMS", "SyntaxChecker", self.__data)
+self.__project.setData("CHECKERSPARMS", "SyntaxChecker",
+self.__data)
 filterList = filterString.split(",")
 if filterList:
 for filter in filterList:
 fileList = \
-[f for f in fileList if not fnmatch.fnmatch(f, filter.strip())]
+[f for f in fileList
+if not fnmatch.fnmatch(f, filter.strip())]
 self.resultList.clear()
 self.noResults = True
 self.cancelled = False
 self.start(fileList)
 # py3flakes warning markers for files, that are ok
 openFiles = vm.getOpenFilenames()
 errorFiles = []
 for index in range(self.resultList.topLevelItemCount()):
 itm = self.resultList.topLevelItem(index)
-errorFiles.append(Utilities.normabspath(itm.data(0, self.filenameRole)))
+errorFiles.append(
+Utilities.normabspath(itm.data(0, self.filenameRole)))
 for file in openFiles:
 if not file in errorFiles:
 editor = vm.getOpenEditor(file)
 editor.clearSyntaxError()
 editor.clearFlakesWarnings()

Mercurial Repositories > eric / file comparison

comparison: Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py

Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py