--- a/eric6/Globals/__init__.py Sat Sep 21 15:37:43 2019 +0200 +++ b/eric6/Globals/__init__.py Sat Sep 21 16:04:17 2019 +0200 @@ -17,8 +17,10 @@ import re import shutil -from PyQt5.QtCore import QDir, QLibraryInfo, QByteArray, QCoreApplication, \ - QT_VERSION_STR, QT_VERSION, QProcess, qVersion +from PyQt5.QtCore import ( + QDir, QLibraryInfo, QByteArray, QCoreApplication, QT_VERSION_STR, + QT_VERSION, QProcess, qVersion +) # names of the various settings objects settingsNameOrganization = "Eric6" @@ -114,9 +116,11 @@ isKDE = False - desktop = os.environ.get("XDG_CURRENT_DESKTOP", "").lower() or \ - os.environ.get("XDG_SESSION_DESKTOP", "").lower() or \ + desktop = ( + os.environ.get("XDG_CURRENT_DESKTOP", "").lower() or + 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: @@ -137,9 +141,11 @@ isGnome = False - desktop = os.environ.get("XDG_CURRENT_DESKTOP", "").lower() or \ - os.environ.get("XDG_SESSION_DESKTOP", "").lower() or \ + desktop = ( + os.environ.get("XDG_CURRENT_DESKTOP", "").lower() or + os.environ.get("XDG_SESSION_DESKTOP", "").lower() or os.environ.get("GDMSESSION", "").lower() + ) if desktop: isGnome = "gnome" in desktop else: