Mercurial Repositories > eric / file diff

--- a/eric6/Globals/__init__.py	Tue Apr 20 19:38:10 2021 +0200
+++ b/eric6/Globals/__init__.py	Tue Apr 20 19:47:39 2021 +0200
@@ -122,10 +122,11 @@
         os.environ.get("XDG_SESSION_DESKTOP", "").lower() or
         os.environ.get("DESKTOP_SESSION", "").lower()
     )
-    if desktop:
-        isKDE = "kde" in desktop or "plasma" in desktop
-    else:
-        isKDE = bool(os.environ.get("KDE_FULL_SESSION", ""))
+    isKDE = (
+        "kde" in desktop or "plasma" in desktop
+        if desktop else
+        bool(os.environ.get("KDE_FULL_SESSION", ""))
+    )
     
     return isKDE
 
@@ -147,10 +148,11 @@
         os.environ.get("XDG_SESSION_DESKTOP", "").lower() or
         os.environ.get("GDMSESSION", "").lower()
     )
-    if desktop:
-        isGnome = "gnome" in desktop
-    else:
-        isGnome = bool(os.environ.get("GNOME_DESKTOP_SESSION_ID", ""))
+    isGnome = (
+        "gnome" in desktop
+        if desktop else
+        bool(os.environ.get("GNOME_DESKTOP_SESSION_ID", ""))
+    )
     
     return isGnome
 
@@ -545,10 +547,11 @@
                               "webBrowserSupport.py")
     proc = QProcess()
     proc.start(sys.executable, [scriptPath, qVersion()])
-    if proc.waitForFinished(10000):
-        variant = str(proc.readAllStandardOutput(), "utf-8", 'replace').strip()
-    else:
-        variant = "None"
+    variant = (
+        str(proc.readAllStandardOutput(), "utf-8", 'replace').strip()
+        if proc.waitForFinished(10000) else
+        "None"
+    )
     return variant
 #
 # eflag: noqa = M801