Mercurial Repositories > Pyramid Project / file diff

--- a/PluginProjectPyramid.py	Wed Dec 30 11:02:09 2020 +0100
+++ b/PluginProjectPyramid.py	Mon Apr 26 17:41:12 2021 +0200
@@ -26,7 +26,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "3.1.0"
+version = "4.0.0"
 className = "ProjectPyramidPlugin"
 packageName = "ProjectPyramid"
 shortDescription = "Project support for Pyramid projects."
@@ -63,14 +63,12 @@
     try:
         usesDarkPalette = e5App().usesDarkPalette()
     except AttributeError:
+        # code for eric < 20.4
         from PyQt5.QtGui import QPalette
         palette = e5App().palette()
         lightness = palette.color(QPalette.Window).lightness()
         usesDarkPalette = lightness <= 128
-    if usesDarkPalette:
-        iconSuffix = "dark"
-    else:
-        iconSuffix = "light"
+    iconSuffix = "dark" if usesDarkPalette else "light"
     
     return {
         "pyramidPage": [
@@ -176,14 +174,12 @@
         try:
             usesDarkPalette = e5App().usesDarkPalette()
         except AttributeError:
+            # code for eric < 20.4
             from PyQt5.QtGui import QPalette
             palette = e5App().palette()
             lightness = palette.color(QPalette.Window).lightness()
             usesDarkPalette = lightness <= 128
-        if usesDarkPalette:
-            iconSuffix = "dark"
-        else:
-            iconSuffix = "light"
+        iconSuffix = "dark" if usesDarkPalette else "light"
         
         self.__object = Project(self, iconSuffix, self.__ui)
         self.__object.initActions()
@@ -194,20 +190,12 @@
         self.__supportedVariants = self.__object.supportedPythonVariants()
         
         if self.__supportedVariants:
-            try:
-                self.__e5project.registerProjectType(
-                    "Pyramid", self.tr("Pyramid"),
-                    self.fileTypesCallback,
-                    lexerAssociationCallback=self.lexerAssociationCallback,
-                    binaryTranslationsCallback=self.binaryTranslationsCallback,
-                    progLanguages=self.__supportedVariants[:])
-            except TypeError:
-                # for backward compatibility
-                self.__e5project.registerProjectType(
-                    "Pyramid", self.tr("Pyramid"),
-                    self.fileTypesCallback,
-                    lexerAssociationCallback=self.lexerAssociationCallback,
-                    binaryTranslationsCallback=self.binaryTranslationsCallback)
+            self.__e5project.registerProjectType(
+                "Pyramid", self.tr("Pyramid"),
+                self.fileTypesCallback,
+                lexerAssociationCallback=self.lexerAssociationCallback,
+                binaryTranslationsCallback=self.binaryTranslationsCallback,
+                progLanguages=self.__supportedVariants[:])
         
         from Project.ProjectBrowser import (
             SourcesBrowserFlag, FormsBrowserFlag, TranslationsBrowserFlag,
@@ -406,9 +394,8 @@
         
         if key in ["VirtualEnvironmentNamePy3"]:
             self.__reregisterProjectType()
-        elif key == "TranslationsEditor":
-            if self.__object:
-                self.__object.registerOpenHook()
+        elif key == "TranslationsEditor" and self.__object:
+            self.__object.registerOpenHook()
     
     def __reregisterProjectType(self):
         """