Mercurial Repositories > eric / file diff

--- a/eric6/Project/ProjectTranslationsBrowser.py	Tue Sep 24 19:44:17 2019 +0200
+++ b/eric6/Project/ProjectTranslationsBrowser.py	Wed Sep 25 18:25:43 2019 +0200
@@ -19,9 +19,10 @@
 from E5Gui import E5MessageBox
 from E5Gui.E5Application import e5App
 
-from .ProjectBrowserModel import ProjectBrowserFileItem, \
-    ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \
-    ProjectBrowserTranslationType
+from .ProjectBrowserModel import (
+    ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem,
+    ProjectBrowserDirectoryItem, ProjectBrowserTranslationType
+)
 from .ProjectBaseBrowser import ProjectBaseBrowser
 
 import UI.PixmapCache
@@ -56,8 +57,8 @@
                                     ProjectBrowserTranslationType, parent)
         self.isTranslationsBrowser = True
         
-        self.selectedItemsFilter = \
-            [ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem]
+        self.selectedItemsFilter = [ProjectBrowserFileItem,
+                                    ProjectBrowserSimpleDirectoryItem]
         
         self.setWindowTitle(self.tr('Translations'))
 
@@ -100,9 +101,10 @@
         self.qmprocBackMenuActions = []
         
         self.menu = QMenu(self)
-        if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC", "PySide2", "PySideC2"]:
+        if self.project.getProjectType() in [
+            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
+            "PySide", "PySideC", "PySide2", "PySideC2"
+        ]:
             act = self.menu.addAction(
                 self.tr('Generate translation'), self.__generateSelected)
             self.tsMenuActions.append(act)
@@ -227,9 +229,10 @@
         self.menu.addAction(self.tr('Configure...'), self._configure)
         
         self.backMenu = QMenu(self)
-        if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC", "PySide2", "PySideC2"]:
+        if self.project.getProjectType() in [
+            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
+            "PySide", "PySideC", "PySide2", "PySideC2"
+        ]:
             act = self.backMenu.addAction(
                 self.tr('Generate all translations'),
                 self.__generateAll)
@@ -288,9 +291,10 @@
 
         # create the menu for multiple selected files
         self.multiMenu = QMenu(self)
-        if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC", "PySide2", "PySideC2"]:
+        if self.project.getProjectType() in [
+            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
+            "PySide", "PySideC", "PySide2", "PySideC2"
+        ]:
             act = self.multiMenu.addAction(
                 self.tr('Generate translations'),
                 self.__generateSelected)
@@ -372,9 +376,10 @@
         self.multiMenu.addAction(self.tr('Configure...'), self._configure)
 
         self.dirMenu = QMenu(self)
-        if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC", "PySide2", "PySideC2"]:
+        if self.project.getProjectType() in [
+            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
+            "PySide", "PySideC", "PySide2", "PySideC2"
+        ]:
             act = self.dirMenu.addAction(
                 self.tr('Generate all translations'),
                 self.__generateAll)
@@ -490,9 +495,10 @@
         """
         Private slot called by the menu aboutToShow signal.
         """
-        if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC", "PySide2", "PySideC2"]:
+        if self.project.getProjectType() in [
+            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
+            "PySide", "PySideC", "PySide2", "PySideC2"
+        ]:
             tsFiles = 0
             qmFiles = 0
             itmList = self.getSelectedItems()
@@ -501,8 +507,10 @@
                     tsFiles += 1
                 elif itm.fileName().endswith('.qm'):
                     qmFiles += 1
-            if (tsFiles > 0 and qmFiles > 0) or \
-               (tsFiles == 0 and qmFiles == 0):
+            if (
+                (tsFiles > 0 and qmFiles > 0) or
+                (tsFiles == 0 and qmFiles == 0)
+            ):
                 for act in self.tsMenuActions + self.qmMenuActions:
                     act.setEnabled(False)
             elif tsFiles > 0:
@@ -532,9 +540,10 @@
         """
         Private slot called by the multiMenu aboutToShow signal.
         """
-        if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC", "PySide2", "PySideC2"]:
+        if self.project.getProjectType() in [
+            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
+            "PySide", "PySideC", "PySide2", "PySideC2"
+        ]:
             tsFiles = 0
             qmFiles = 0
             itmList = self.getSelectedItems()
@@ -543,8 +552,10 @@
                     tsFiles += 1
                 elif itm.fileName().endswith('.qm'):
                     qmFiles += 1
-            if (tsFiles > 0 and qmFiles > 0) or \
-               (tsFiles == 0 and qmFiles == 0):
+            if (
+                (tsFiles > 0 and qmFiles > 0) or
+                (tsFiles == 0 and qmFiles == 0)
+            ):
                 for act in self.tsMultiMenuActions + self.qmMultiMenuActions:
                     act.setEnabled(False)
             elif tsFiles > 0:
@@ -572,9 +583,10 @@
         """
         Private slot called by the dirMenu aboutToShow signal.
         """
-        if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC", "PySide2", "PySideC2"]:
+        if self.project.getProjectType() in [
+            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
+            "PySide", "PySideC", "PySide2", "PySideC2"
+        ]:
             if self.pylupdateProcRunning:
                 for act in self.tsprocDirMenuActions:
                     act.setEnabled(False)
@@ -592,9 +604,10 @@
         """
         Private slot called by the backMenu aboutToShow signal.
         """
-        if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC", "PySide2", "PySideC2"]:
+        if self.project.getProjectType() in [
+            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
+            "PySide", "PySideC", "PySide2", "PySideC2"
+        ]:
             if self.pylupdateProcRunning:
                 for act in self.tsprocBackMenuActions:
                     act.setEnabled(False)
@@ -613,8 +626,10 @@
         itm = self.model().item(self.currentIndex())
         if isinstance(itm, ProjectBrowserFileItem):
             dn = os.path.dirname(itm.fileName())
-        elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \
-                isinstance(itm, ProjectBrowserDirectoryItem):
+        elif isinstance(
+            itm,
+            (ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem)
+        ):
             dn = itm.dirName()
         else:
             dn = None
@@ -665,8 +680,9 @@
         
         translationFiles = [itm.fileName() for itm in itmList]
         
-        from UI.DeleteFilesConfirmationDialog import \
+        from UI.DeleteFilesConfirmationDialog import (
             DeleteFilesConfirmationDialog
+        )
         dlg = DeleteFilesConfirmationDialog(
             self.parent(),
             self.tr("Delete translation files"),
@@ -763,8 +779,8 @@
                      for lang in langs if lang.fileName().endswith('.ts')]
         else:
             try:
-                pattern = self.project.pdata["TRANSLATIONPATTERN"]\
-                    .replace("%language%", "*")
+                pattern = self.project.pdata["TRANSLATIONPATTERN"].replace(
+                    "%language%", "*")
                 langs = [lang for lang in self.project.pdata["TRANSLATIONS"]
                          if fnmatch.fnmatch(lang, pattern)]
             except IndexError:
@@ -1004,8 +1020,9 @@
         
         # generate a minimal temporary projectfile suitable for pylupdate
         self.__tmpProjects = []
-        if self.project.getProjectLanguage() in \
-                ["Python", "Python2", "Python3"]:
+        if self.project.getProjectLanguage() in [
+            "Python", "Python2", "Python3"
+        ]:
             ok = self.__writeTempProjectFile(langs, [".py"])
         else:
             ok = False
@@ -1179,9 +1196,10 @@
                 self.hooks["releaseSelected"](li)
                 return
         
-        if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC", "PySide2", "PySideC2"]:
+        if self.project.getProjectType() in [
+            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
+            "PySide", "PySideC", "PySide2", "PySideC2"
+        ]:
             lrelease = os.path.join(
                 Utilities.getQtBinariesPath(),
                 Utilities.generateQtToolName("lrelease"))
@@ -1195,8 +1213,8 @@
                      for lang in langs if lang.fileName().endswith('.ts')]
         else:
             try:
-                pattern = self.project.pdata["TRANSLATIONPATTERN"]\
-                    .replace("%language%", "*")
+                pattern = self.project.pdata["TRANSLATIONPATTERN"].replace(
+                    "%language%", "*")
                 langs = [lang for lang in self.project.pdata["TRANSLATIONS"]
                          if fnmatch.fnmatch(lang, pattern)]
             except IndexError: