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

-:e2fad77b41ba
+:996367a89673
 from E5Gui.E5Application import e5App
 from .Pep8Checker import Pep8Checker, Pep8Py2Checker
 from .Pep8CodeSelectionDialog import Pep8CodeSelectionDialog
 from .Pep8StatisticsDialog import Pep8StatisticsDialog
+from .Pep8Fixer import Pep8Fixer
 from .Ui_Pep8Dialog import Ui_Pep8Dialog
 import UI.PixmapCache
 import Preferences
 UI.PixmapCache.getIcon("clearLeft.png"))
 self.clearButtonExcludeMessages.setIcon(
 UI.PixmapCache.getIcon("clearLeft.png"))
 self.clearButtonIncludeMessages.setIcon(
 UI.PixmapCache.getIcon("clearLeft.png"))
+self.clearButtonFixIssues.setIcon(
+UI.PixmapCache.getIcon("clearLeft.png"))
 self.on_loadDefaultButton_clicked()
 def __resort(self):
 """
 Private method to resort the tree.
 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
 self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
 self.__data = self.__project.getData("CHECKERSPARMS", "Pep8Checker")
-if self.__data is None or "ExcludeFiles" not in self.__data:
+if self.__data is None or \
+"ExcludeFiles" not in self.__data or \
+len(self.__data) != 6:
 # initialize the data structure
 self.__data = {
 "ExcludeFiles" : "",
 "ExcludeMessages" : pep8.DEFAULT_IGNORE,
 "IncludeMessages" : "",
 "RepeatMessages" : False,
+"FixCodes" : "",
+"FixIssues" : False,
 }
 self.excludeFilesEdit.setText(self.__data["ExcludeFiles"])
 self.excludeMessagesEdit.setText(self.__data["ExcludeMessages"])
 self.includeMessagesEdit.setText(self.__data["IncludeMessages"])
 self.repeatCheckBox.setChecked(self.__data["RepeatMessages"])
+self.fixIssuesEdit.setText(self.__data["FixCodes"])
-def start(self, fn, codestring = "", save = False, repeat = None):
+self.fixIssuesCheckBox.setChecked(self.__data["FixIssues"])
+def start(self, fn, save = False, repeat = None):
 """
 Public slot to start the PEP 8 check.
 @param fn file or list of files or directory to be checked
 (string or list of strings)
-@keyparam codestring string containing the code to be checked (string).
-If this is given, file must be a single file name.
 @keyparam save flag indicating to save the given
 file/file list/directory (boolean)
 @keyparam repeat state of the repeat check box if it is not None
 (None or boolean)
 """
 tuple(Preferences.getPython("Python3Extensions")))]
 py2files = [f for f in files \
 if f.endswith(
 tuple(Preferences.getPython("PythonExtensions")))]
-if (codestring and len(py3files) == 1) or \
+if len(py3files) + len(py2files) > 0:
-(codestring and len(py2files) == 1) or \
-(not codestring and 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()
 repeatMessages = self.repeatCheckBox.isChecked()
+fixCodes = self.fixIssuesEdit.text()
+fixIssues = self.fixIssuesCheckBox.isChecked() and repeatMessages
 # now go through all the files
 progress = 0
 for file in py3files + py2files:
 self.checkProgress.setValue(progress)
 self.__resort()
 return
 self.__lastFileItem = None
-if codestring:
+try:
-source = codestring.splitlines(True)
+source, encoding = Utilities.readEncodedFile(file)
-else:
+source = source.splitlines(True)
-try:
+except (UnicodeError, IOError) as msg:
-source = Utilities.readEncodedFile(file)[0]
+self.noResults = False
-# convert eols
+self.__createResultItem(file, "1", "1",
-source = Utilities.convertLineEnds(source, "\n")
+self.trUtf8("Error: {0}").format(str(msg))\
-source = source.splitlines(True)
+.rstrip()[1:-1])
-except (UnicodeError, IOError) as msg:
+progress += 1
-self.noResults = False
+continue
-self.__createResultItem(file, "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]
+if fixIssues:
+fixer = Pep8Fixer(self.__project, file, source,
+fixCodes, True)  # always fix in place
+else:
+fixer = None
 if ("FileType" in flags and
 flags["FileType"] in ["Python", "Python2"]) or \
 file in py2files or \
 (ext in [".py", ".pyw"] and \
 Preferences.getProject("DeterminePyFromProject") and \
 for message in checker.messages:
 fname, lineno, position, text = message
 if not source[lineno - 1].strip()\
 .endswith("__IGNORE_WARNING__"):
 self.noResults = False
+if fixer:
+fixed, msg = fixer.fixIssue(lineno, position, text)
+if fixed:
+text += "\n" + \
+self.trUtf8("Fix: {0}").format(msg)
 self.__createResultItem(
 fname, lineno, position, text)
+fixer and fixer.saveFile(encoding)
 self.__updateStatistics(checker.statistics)
 progress += 1
 self.checkProgress.setValue(progress)
 QApplication.processEvents()
 self.__resort()
 data = {
 "ExcludeFiles" : self.excludeFilesEdit.text(),
 "ExcludeMessages" : self.excludeMessagesEdit.text(),
 "IncludeMessages" : self.includeMessagesEdit.text(),
 "RepeatMessages" : self.repeatCheckBox.isChecked(),
+"FixCodes" : self.fixIssuesEdit.text(),
+"FixIssues" : self.fixIssuesCheckBox.isChecked(),
 }
 if data != self.__data:
 self.__data = data
 self.__project.setData("CHECKERSPARMS", "Pep8Checker",
 self.__data)
 def on_excludeMessagesSelectButton_clicked(self):
 """
 Private slot to select the message codes to be excluded via a
 selection dialog.
 """
-dlg = Pep8CodeSelectionDialog(self.excludeMessagesEdit.text(), self)
+dlg = Pep8CodeSelectionDialog(
+self.excludeMessagesEdit.text(), False, self)
 if dlg.exec_() == QDialog.Accepted:
 self.excludeMessagesEdit.setText(dlg.getSelectedCodes())
 @pyqtSlot()
 def on_includeMessagesSelectButton_clicked(self):
 """
 Private slot to select the message codes to be included via a
 selection dialog.
 """
-dlg = Pep8CodeSelectionDialog(self.includeMessagesEdit.text(), self)
+dlg = Pep8CodeSelectionDialog(
+self.includeMessagesEdit.text(), False, self)
 if dlg.exec_() == QDialog.Accepted:
 self.includeMessagesEdit.setText(dlg.getSelectedCodes())
+@pyqtSlot()
+def on_fixIssuesSelectButton_clicked(self):
+"""
+Private slot to select the issue codes to be fixed via a
+selection dialog.
+"""
+dlg = Pep8CodeSelectionDialog(
+self.fixIssuesEdit.text(), True, self)
+if dlg.exec_() == QDialog.Accepted:
+self.fixIssuesEdit.setText(dlg.getSelectedCodes())
 @pyqtSlot(QTreeWidgetItem, int)
 def on_resultList_itemActivated(self, item, column):
 """
 Private slot to handle the activation of an item.
 "PEP8/ExcludeMessages", pep8.DEFAULT_IGNORE))
 self.includeMessagesEdit.setText(Preferences.Prefs.settings.value(
 "PEP8/IncludeMessages"))
 ##        self.repeatCheckBox.setChecked(Preferences.toBool(
 ##            Preferences.Prefs.settings.value("PEP8/RepeatMessages")))
+self.fixIssuesEdit.setText(Preferences.Prefs.settings.value(
+"PEP8/FixCodes"))
+self.fixIssuesCheckBox.setChecked(Preferences.toBool(
+Preferences.Prefs.settings.value("PEP8/FixIssues")))
 @pyqtSlot()
 def on_storeDefaultButton_clicked(self):
 """
 Private slot to store the current configuration values as
 self.excludeMessagesEdit.text())
 Preferences.Prefs.settings.setValue("PEP8/IncludeMessages",
 self.includeMessagesEdit.text())
 ##        Preferences.Prefs.settings.setValue("PEP8/RepeatMessages",
 ##            self.repeatCheckBox.isChecked())
+Preferences.Prefs.settings.setValue("PEP8/FixCodes",
+self.fixIssuesEdit.text())
+Preferences.Prefs.settings.setValue("PEP8/FixIssues",
+self.fixIssuesCheckBox.isChecked())
 @pyqtSlot(QAbstractButton)
 def on_buttonBox_clicked(self, button):
 """
 Private slot called by a button of the button box clicked.

Mercurial Repositories > eric / file comparison

comparison: Plugins/CheckerPlugins/Pep8/Pep8Dialog.py

Plugins/CheckerPlugins/Pep8/Pep8Dialog.py