Mercurial Repositories > Vulture Checker / file diff

--- a/VultureChecker/VultureCheckerDialog.py	Wed Jan 01 11:58:52 2020 +0100
+++ b/VultureChecker/VultureCheckerDialog.py	Tue Jun 23 17:33:21 2020 +0200
@@ -7,13 +7,6 @@
 Module implementing a dialog to show the vulture check results.
 """
 
-from __future__ import unicode_literals
-
-try:
-    str = unicode       # __IGNORE_EXCEPTION__ __IGNORE_WARNING__
-except NameError:
-    pass
-
 import os
 import fnmatch
 
@@ -243,7 +236,7 @@
             
             # now go through all the files
             self.progress = 0
-            if len(self.files) == 1 or not self.vultureService.hasBatch:
+            if len(self.files) == 1:
                 self.__batch = False
                 self.vultureCheck()
             else:
@@ -442,8 +435,8 @@
                       if f.strip()]
         if filterList:
             for fileFilter in filterList:
-                fileList = \
-                    [f for f in fileList if not fnmatch.fnmatch(f, fileFilter)]
+                fileList = [f for f in fileList
+                            if not fnmatch.fnmatch(f, fileFilter)]
         
         self.__slotsAreUsed = self.slotsCheckBox.isChecked()
         if self.__slotsAreUsed != self.__data["SlotsAreUsed"]:
@@ -545,7 +538,7 @@
             regExp = QRegExp(pattern, Qt.CaseSensitive, QRegExp.Wildcard)
             filteredList = [item for item in filteredList
                             if not regExp.exactMatch(item.name)]
-        return filteredList
+        return filteredList     # __IGNORE_WARNING_M834__
     
     def __getUnusedItems(self, defined, used):
         """
@@ -558,9 +551,7 @@
         @return list of unused items
         @rtype list of VultureItem
         """
-        unusedItems = [item for item in set(defined)
-                       if item.name not in used]
-        return unusedItems
+        return [item for item in set(defined) if item.name not in used]
 
     def __unusedFunctions(self):
         """
@@ -656,10 +647,7 @@
     def __createResultItems(self):
         """
         Private method to populate the list with the analysis result.
-        """         # __IGNORE_WARNING__
-        def filename(item):
-            return item.filename
-        
+        """
         lastFileItem = None
         lastFileName = ""
         items = (self.__unusedFunctions() +
@@ -670,7 +658,7 @@
                  self.__unusedAttributes())
         if not self.__slotsAreUsed:
             items += self.__unusedSlots()
-        for item in sorted(items, key=filename):
+        for item in sorted(items, key=lambda item: item.filename):
             if lastFileItem is None or lastFileName != item.filename:
                 lastFileItem = self.__createFileItem(item.filename)
                 lastFileName = item.filename
@@ -752,9 +740,8 @@
         @return list of selected non file items
         @rtype list of QTreeWidgetItem
         """
-        itmList = [i for i in self.resultList.selectedItems()
-                   if i.parent() is not None]
-        return itmList
+        return [i for i in self.resultList.selectedItems()
+                if i.parent() is not None]
     
     def __editWhiteList(self):
         """