Mercurial Repositories > eric / file diff

--- a/eric6/Project/ProjectTranslationsBrowser.py	Fri Apr 02 11:59:41 2021 +0200
+++ b/eric6/Project/ProjectTranslationsBrowser.py	Sat May 01 14:27:20 2021 +0200
@@ -12,6 +12,7 @@
 import shutil
 import fnmatch
 import functools
+import contextlib
 
 from PyQt5.QtCore import pyqtSignal, QProcess
 from PyQt5.QtWidgets import QDialog, QMenu
@@ -461,7 +462,7 @@
         if not self.project.isOpen():
             return
         
-        try:
+        with contextlib.suppress(Exception):
             categories = self.getSelectedItemsCountCategorized(
                 [ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem])
             cnt = categories["sum"]
@@ -489,8 +490,6 @@
                         self.backMenu.popup(self.mapToGlobal(coord))
                 else:
                     self.backMenu.popup(self.mapToGlobal(coord))
-        except Exception:           # secok
-            pass
         
     def __showContextMenu(self):
         """
@@ -711,10 +710,12 @@
                     dname = self.project.getRelativePath(itm.dirName())
                     trfiles = sorted(self.project.pdata["TRANSLATIONS"][:])
                     for trfile in trfiles:
-                        if trfile.startswith(dname):
-                            if trfile not in fileNames:
-                                fileNames.append(
-                                    os.path.join(self.project.ppath, trfile))
+                        if (
+                            trfile.startswith(dname) and
+                            trfile not in fileNames
+                        ):
+                            fileNames.append(
+                                os.path.join(self.project.ppath, trfile))
                 else:
                     fn = itm.fileName()
                     if fn not in fileNames:
@@ -954,18 +955,16 @@
                 self.tr(
                     "The generation of the translation files (*.ts) has"
                     " failed.{0}").format(info),
-                kind=NotificationTypes.Critical,
+                kind=NotificationTypes.CRITICAL,
                 timeout=0)
         
         for index in range(len(self.__pylupdateProcesses)):
             if proc == self.__pylupdateProcesses[index][0]:
                 tmpProjectFile = self.__pylupdateProcesses[index][1]
                 if tmpProjectFile:
-                    try:
+                    with contextlib.suppress(OSError):
                         self.__tmpProjects.remove(tmpProjectFile)
                         os.remove(tmpProjectFile)
-                    except OSError:
-                        pass
                 del self.__pylupdateProcesses[index]
                 break
         
@@ -983,10 +982,7 @@
         @param generateAll flag indicating whether all translations should be
             generated (boolean)
         """
-        if generateAll:
-            langs = []
-        else:
-            langs = self.getSelectedItems()
+        langs = [] if generateAll else self.getSelectedItems()
         
         # Hook support
         if generateAll:
@@ -1026,12 +1022,10 @@
         else:
             return
         
-        if self.project.getProjectType() in ["PyQt5", "PyQt5C"]:
+        if self.project.getProjectType() in ["PyQt5", "PyQt5C", "E6Plugin"]:
             self.pylupdate = Utilities.generatePyQtToolPath('pylupdate5')
         elif self.project.getProjectType() in ["PyQt6", "PyQt6C"]:
             self.pylupdate = Utilities.generatePyQtToolPath('pylupdate6')
-        elif self.project.getProjectType() in ["E6Plugin"]:
-            self.pylupdate = Utilities.generatePyQtToolPath('pylupdate5')
         elif self.project.getProjectType() in ["PySide2", "PySide2C"]:
             self.pylupdate = Utilities.generatePySideToolPath(
                 'pyside2-lupdate', variant=2)
@@ -1133,11 +1127,9 @@
                             'Ensure that it is in the search path.'
                         ).format(self.pylupdate))
                     # cleanup
-                    try:
+                    with contextlib.suppress(OSError):
                         self.__tmpProjects.remove(tempProjectFile)
                         os.remove(tempProjectFile)
-                    except OSError:
-                        pass
         
     def __generateAll(self):
         """
@@ -1211,7 +1203,7 @@
                 self.tr("Translation file release"),
                 self.tr(
                     "The release of the translation files (*.qm) has failed."),
-                kind=NotificationTypes.Critical,
+                kind=NotificationTypes.CRITICAL,
                 timeout=0)
         
         for index in range(len(self.__lreleaseProcesses)):
@@ -1230,10 +1222,7 @@
         @param generateAll flag indicating whether all translations should be
             released (boolean)
         """
-        if generateAll:
-            langs = []
-        else:
-            langs = self.getSelectedItems()
+        langs = [] if generateAll else self.getSelectedItems()
         
         # Hooks support
         if generateAll:
@@ -1257,7 +1246,7 @@
         else:
             return
         if Utilities.isWindowsPlatform():
-            lrelease = lrelease + '.exe'
+            lrelease += '.exe'
         
         if langs:
             langs = [self.project.getRelativePath(lang.fileName())