eric: comparison src/eric7/CodeFormatting/IsortFormattingDialog.py

-:f3cf935c0c66
+:5f138ee215a5
 self.__performAction()
 def __performAction(self):
 """
-Private method to execute the requested formatting action.
+Private method to execute the requested sorting action.
 """
 self.progressBar.setValue(0)
 self.progressBar.setVisible(True)
 self.statisticsGroup.setVisible(False)
 self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False)
 self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True)
 files = self.__filterFiles(self.__filesList)
 if len(files) > 1:
-self.__formatManyFiles(files)
+self.__sortManyFiles(files)
 elif len(files) == 1:
-self.__formatOneFile(files[0])
+self.__sortOneFile(files[0])
 def __filterFiles(self, filesList):
 """
 Private method to filter the given list of files according the
 configuration parameters.
 self.__updateStatistics()
 self.__populateStatusFilterCombo()
 def __updateStatistics(self):
 """
-Private method to update the statistics about the recent formatting run and
+Private method to update the statistics about the recent sorting run and
 make them visible.
 """
 self.reformattedLabel.setText(
-self.tr("Reformatted:")
+self.tr("Resorted:")
 if self.__config["__action__"] is IsortFormattingAction.Sort
-else self.tr("Would Reformat:")
+else self.tr("Would Resort:")
 )
 total = self.progressBar.maximum()
 self.totalCountLabel.setText("{0:n}".format(total))
 """
 dataType = item.data(0, IsortFormattingDialog.DataTypeRole)
 if dataType == "error":
 EricMessageBox.critical(
 self,
-self.tr("Formatting Failure"),
+self.tr("Imports Sorting Failure"),
-self.tr("<p>Formatting failed due to this error.</p><p>{0}</p>").format(
+self.tr(
-item.data(0, IsortFormattingDialog.DataRole)
+"<p>Imports sorting failed due to this error.</p><p>{0}</p>"
-),
+).format(item.data(0, IsortFormattingDialog.DataRole)),
 )
 elif dataType == "diff":
 if self.__diffDialog is None:
 self.__diffDialog = FormattingDiffWidget()
 self.__diffDialog.showDiff(item.data(0, IsortFormattingDialog.DataRole))
 self.__diffDialog.close()
 evt.accept()
 def __handleIsortResult(self, filename, status, data=""):
 """
-Private method to handle an isort formatting result.
+Private method to handle an isort sorting result.
 @param filename name of the processed file
 @type str
 @param status status of the performed action (one of 'changed', 'failed',
 'skipped' or 'unchanged')
 self.progressBar.setValue(self.progressBar.value() + 1)
 QCoreApplication.processEvents()
-def __formatManyFiles(self, files):
+def __sortManyFiles(self, files):
 """
-Private method to format the list of files according the configuration using
+Private method to sort imports of the list of files according the configuration
-multiple processes in parallel.
+using multiple processes in parallel.
 @param files list of files to be processed
 @type list of str
 """
 maxProcesses = Preferences.getUI("BackgroundServiceProcesses")
 taskQueue.put((file, self.__config["__action__"]))
 # Start worker processes
 workers = [
 multiprocessing.Process(
-target=self.formattingWorkerTask,
+target=self.sortingWorkerTask,
 args=(taskQueue, doneQueue, self.__isortConfig),
 )
 for _ in range(NumberOfProcesses)
 ]
 for worker in workers:
 doneQueue.close()
 self.__finish()
 @staticmethod
-def formattingWorkerTask(inputQueue, outputQueue, isortConfig):
+def sortingWorkerTask(inputQueue, outputQueue, isortConfig):
 """
 Static method acting as the parallel worker for the formatting task.
 @param inputQueue input queue
 @type multiprocessing.Queue
 filename=file,
 )
 outputQueue.put(result)
-def __formatOneFile(self, file):
+def __sortOneFile(self, file):
 """
-Private method to format the list of files according the configuration.
+Private method to sort the imports of the list of files according the
+configuration.
 @param file name of the file to be processed
 @type str
 """
 if self.__config["__action__"] == IsortFormattingAction.Diff:
 @dataclass
 class IsortStatistics:
 """
-Class containing the isort reformatting statistic data.
+Class containing the isort statistic data.
 """
 skippedCount: int = 0
 changeCount: int = 0
 sameCount: int = 0
 @dataclass
 class IsortResult:
 """
-Class containing the isort reformatting result data.
+Class containing the isort result data.
 """
 status: str = ""
 filename: str = ""
 data: str = ""

Mercurial Repositories > eric / file comparison

comparison: src/eric7/CodeFormatting/IsortFormattingDialog.py

src/eric7/CodeFormatting/IsortFormattingDialog.py