eric: comparison eric6/UI/UserInterface.py

-:fb0ef164f536
+:698ae46f40a4
 import shutil
 import json
 import datetime
 import getpass
 import functools
+import contextlib
 from PyQt5.QtCore import (
 pyqtSlot, QTimer, QFile, QFileInfo, pyqtSignal, PYQT_VERSION_STR, QDate,
 QIODevice, qVersion, QProcess, QSize, QUrl, QObject, Qt, QUuid, QThread,
 QUrlQuery
 from E5Network.E5NetworkProxyFactory import (
 E5NetworkProxyFactory, proxyAuthenticationRequired
 )
 try:
-from E5Network.E5SslErrorHandler import E5SslErrorHandler
+from E5Network.E5SslErrorHandler import E5SslErrorHandler, E5SslErrorState
 SSL_AVAILABLE = True
 except ImportError:
 SSL_AVAILABLE = False
 from eric6config import getConfig
 @param stderr flag indicating stderr is being redirected
 @type bool
 @param parent reference to the parent object
 @type QObject
 """
-super(Redirector, self).__init__(parent)
+super().__init__(parent)
 self.stderr = stderr
 self.buffer = ''
 def __nWrite(self, n):
 """
 a restart
 @type list of str
 @param originalPathString original PATH environment variable
 @type str
 """
-super(UserInterface, self).__init__()
+super().__init__()
 self.__restartArgs = restartArguments[:]
 self.setStyle(Preferences.getUI("Style"),
 Preferences.getUI("StyleSheet"))
 self.maxEditorPathLen = Preferences.getUI("CaptionFilenameLength")
 self.locale = locale
-self.__noOpenAtStartup = noOpenAtStartup
+self.__openAtStartup = not noOpenAtStartup
 self.__noCrashOpenAtStartup = noCrashOpenAtStartup
 self.__disableCrashSession = disableCrashSession
 self.__disabledPlugins = disabledPlugins[:]
 self.__originalPathString = originalPathString
 """
 Private method to create the Sidebars layout.
 @param debugServer reference to the debug server object
 """
-from E5Gui.E5SideBar import E5SideBar
+from E5Gui.E5SideBar import E5SideBar, E5SideBarSide
 logging.debug("Creating Sidebars Layout...")
 delay = Preferences.getUI("SidebarDelay")
 # Create the left sidebar
-self.leftSidebar = E5SideBar(E5SideBar.West, delay)
+self.leftSidebar = E5SideBar(E5SideBarSide.WEST, delay)
 # Create the bottom sidebar
-self.bottomSidebar = E5SideBar(E5SideBar.South, delay)
+self.bottomSidebar = E5SideBar(E5SideBarSide.SOUTH, delay)
 # Create the right sidebar
-self.rightSidebar = E5SideBar(E5SideBar.East, delay)
+self.rightSidebar = E5SideBar(E5SideBarSide.EAST, delay)
 ####################################################
 ## Populate the left side bar
 ####################################################
 if self.__readCrashSession():
 return
 # no args, return
 if args is None:
-if not self.__noOpenAtStartup:
+if self.__openAtStartup:
 self.__openOnStartup()
 return
 opens = 0
 # holds space delimited list of command args, if any
 argsStr = None
 # flag indicating '--' options was found
 ddseen = False
-if Utilities.isWindowsPlatform():
+argChars = ['-', '/'] if Utilities.isWindowsPlatform() else ['-']
-argChars = ['-', '/']
-else:
-argChars = ['-']
 for arg in args:
 # handle a request to start with last session
 if arg == '--start-file':
 self.__openOnStartup("File")
 # store away any args we had
 if argsStr is not None:
 self.debuggerUI.setArgvHistory(argsStr)
-if opens == 0:
+if opens == 0 and self.__openAtStartup:
 # no files, project or multiproject was given
-if not self.__noOpenAtStartup:
+self.__openOnStartup()
-self.__openOnStartup()
 def processInstallInfoFile(self):
 """
 Public method to process the file containing installation information.
 """
 else:
 filename = os.path.join(getConfig("ericDir"),
 "eric6installpip.json")
 if os.path.exists(filename):
 # eric was installed via pip (i.e. eric-ide)
-try:
+with contextlib.suppress(OSError):
 installDateTime = datetime.datetime.now(tz=None)
 with open(filename, "r") as infoFile:
 installInfo = json.load(infoFile)
 installInfo["guessed"] = True
 installInfo["eric"] = getConfig("ericDir")
 "%Y-%m-%d %H:%M:%S")
 installInfo["sudo"] = not os.access(
 installInfo["eric"], os.W_OK)
 with open(installInfoFile, "w") as infoFile:
 json.dump(installInfo, infoFile, indent=2)
-except OSError:
-# ignore this
-pass
 else:
 changed = False
 with open(installInfoFile, "r") as infoFile:
 installInfo = json.load(infoFile)
 import sip
 sip_version_str = sip.SIP_VERSION_STR
 except (ImportError, AttributeError):
 sip_version_str = "sip version not available"
-if sys.maxsize > 2**32:
+sizeStr = "64-Bit" if sys.maxsize > 2**32 else "32-Bit"
-sizeStr = "64-Bit"
-else:
-sizeStr = "32-Bit"
 versionText = self.tr(
 """<h2>Version Numbers</h2>"""
 """<table>""")
 versionText += (
 """<tr><td><b>Qt</b></td><td>{0}</td></tr>"""
 ).format(qVersion())
 versionText += (
 """<tr><td><b>PyQt</b></td><td>{0}</td></tr>"""
 ).format(PYQT_VERSION_STR)
-try:
+with contextlib.suppress(ImportError, AttributeError):
 from PyQt5 import QtChart
 versionText += (
 """<tr><td><b>PyQtChart</b></td><td>{0}</td></tr>"""
 ).format(QtChart.PYQT_CHART_VERSION_STR)
-except (ImportError, AttributeError):
+with contextlib.suppress(ImportError, AttributeError):
-pass
-try:
 from PyQt5 import QtWebEngine
 versionText += (
 """<tr><td><b>PyQtWebEngine</b></td><td>{0}</td></tr>"""
 ).format(QtWebEngine.PYQT_WEBENGINE_VERSION_STR)
-except (ImportError, AttributeError):
-pass
 versionText += (
 """<tr><td><b>QScintilla</b></td><td>{0}</td></tr>"""
 ).format(QSCINTILLA_VERSION_STR)
 versionText += (
 """<tr><td><b>sip</b></td><td>{0}</td></tr>"""
 ).format(sip_version_str)
-try:
+with contextlib.suppress(ImportError):
 from WebBrowser.Tools import WebBrowserTools
 chromeVersion = WebBrowserTools.getWebEngineVersions()[0]
 versionText += (
 """<tr><td><b>WebEngine</b></td><td>{0}</td></tr>"""
 ).format(chromeVersion)
-except ImportError:
-pass
 versionText += ("""<tr><td><b>{0}</b></td><td>{1}</td></tr>"""
 ).format(Program, Version)
 versionText += self.tr("""</table>""")
 E5MessageBox.about(self, Program, versionText)
 @param attachFile name of a file to put into the body of the
 email (string)
 @param deleteAttachFile flag indicating to delete the file after
 it has been read (boolean)
 """
-if mode == "feature":
+address = FeatureAddress if mode == "feature" else BugAddress
-address = FeatureAddress
-else:
-address = BugAddress
 subject = "[eric] "
 if attachFile is not None:
 with open(attachFile, "r", encoding="utf-8") as f:
 body = f.read()
 if deleteAttachFile:
 @param actions list of actions (list of E5Action)
 @param actionType string denoting the action set to remove from.
 It must be one of "ui" or "wizards".
 """
 for act in actions:
-try:
+with contextlib.suppress(ValueError):
 if actionType == 'ui':
 self.actions.remove(act)
 elif actionType == 'wizards':
 self.wizardsActions.remove(act)
-except ValueError:
-pass
 def getActions(self, actionType):
 """
 Public method to get a list of all actions.
 @return list of toolbars
 @rtype list of QToolBar
 """
 toolbars = []
 for tbName in self.__toolbars:
-try:
+with contextlib.suppress(IndexError):
 if self.__toolbars[tbName][2] == category:
 toolbars.append(self.__toolbars[tbName][1])
-except IndexError:
-# backward compatibility; category is not yet supported
-pass
 return toolbars
 def getLocale(self):
 """
 Private method to restart the application.
 @param ask flag indicating to ask the user for permission
 @type bool
 """
-if ask:
+res = (
-res = E5MessageBox.yesNo(
+E5MessageBox.yesNo(
 self,
 self.tr("Restart application"),
 self.tr(
 """The application needs to be restarted. Do it now?"""),
 yesDefault=True)
-else:
+if ask else
-res = True
+True
+)
 if res and self.__shutdown():
 e5App().closeAllWindows()
 program = sys.executable
 eric6 = os.path.join(getConfig("ericDir"), "eric6.py")
 act.setData(-2)
 act.setEnabled(self.currentToolGroup >= 0)
 self.__menus["user_tools"].addSeparator()
 # add the configurable entries
-idx = 0
 try:
-for tool in self.toolGroups[self.currentToolGroup][1]:
+for idx, tool in enumerate(
+self.toolGroups[self.currentToolGroup][1]
+):
 if tool['menutext'] == '--':
 self.__menus["user_tools"].addSeparator()
 else:
 act = self.__menus["user_tools"].addAction(
 UI.PixmapCache.getIcon(tool['icon']),
 tool['menutext'])
 act.setData(idx)
-idx += 1
 except IndexError:
 # the current tool group might have been deleted
 act = self.__menus["user_tools"].addAction(
 self.tr("No User Tools Configured"))
 act.setData(-3)
 """
 self.toolGroupsMenu.clear()
 # add the configurable tool groups
 if self.toolGroups:
-idx = 0
+for idx, toolGroup in enumerate(self.toolGroups):
-for toolGroup in self.toolGroups:
 act = self.toolGroupsMenu.addAction(toolGroup[0])
 act.setData(idx)
 if self.currentToolGroup == idx:
 font = act.font()
 font.setBold(True)
 act.setFont(font)
-idx += 1
 else:
 act = self.toolGroupsMenu.addAction(
 self.tr("No User Tools Configured"))
 act.setData(-3)
 if not ext:
 ex = selectedFilter.split("(*")[1].split(")")[0]
 if ex:
 fn += ex
-if os.path.exists(fn):
+ok = (
-ok = E5MessageBox.yesNo(
+E5MessageBox.yesNo(
 self,
 self.tr("Export Keyboard Shortcuts"),
 self.tr("""<p>The keyboard shortcuts file <b>{0}</b> exists"""
 """ already. Overwrite it?</p>""").format(fn))
-else:
+if os.path.exists(fn) else
-ok = True
+True
+)
 if ok:
 from Preferences import Shortcuts
 Shortcuts.exportShortcuts(fn)
 """
 Private slot to check some actions for their enable/disable status.
 @param editor editor window
 """
-if editor:
+fn = editor.getFileName() if editor else None
-fn = editor.getFileName()
-else:
-fn = None
 if fn:
 dbs = e5App().getObject("DebugServer")
 for language in dbs.getSupportedLanguages():
 exts = dbs.getExtensions(language)
 if fn.endswith(exts):
 """
 for ext in (".esj", ".e5s"):
 fn = os.path.join(Utilities.getConfigDir(),
 f"eric6_crash_session{ext}")
 if os.path.exists(fn):
-try:
+with contextlib.suppress(OSError):
 os.remove(fn)
-except OSError:
-# ignore it silently
-pass
 def __writeCrashSession(self):
 """
 Private slot to write a crash session file.
 """
 return True
 if self.__webBrowserProcess is not None:
 self.__webBrowserShutdown()
-if self.irc is not None:
+if self.irc is not None and not self.irc.shutdown():
-if not self.irc.shutdown():
+return False
-return False
 sessionCreated = self.__writeSession()
 self.__astViewer.hide()
 elif period in [2, 3, 4]:
 lastCheck = Preferences.Prefs.settings.value(
 "Updates/LastCheckDate", QDate(1970, 1, 1))
 if lastCheck.isValid():
 now = QDate.currentDate()
-if period == 2 and lastCheck.day() == now.day():
+if (
-# daily
+(period == 2 and lastCheck.day() == now.day()) or
-return
+(period == 3 and lastCheck.daysTo(now) < 7) or
-elif period == 3 and lastCheck.daysTo(now) < 7:
+(period == 4 and (lastCheck.daysTo(now) <
-# weekly
+lastCheck.daysInMonth()))
-return
+):
-elif period == 4 and (lastCheck.daysTo(now) <
+# daily, weekly, monthly
-lastCheck.daysInMonth()):
-# monthly
 return
 self.__inVersionCheck = True
 self.manualUpdatesCheck = manual
 self.showAvailableVersions = showVersions
 @param reply reference to the reply object (QNetworkReply)
 @param errors list of SSL errors (list of QSslError)
 """
 ignored = self.__sslErrorHandler.sslErrorsReply(reply, errors)[0]
-if ignored == E5SslErrorHandler.NotIgnored:
+if ignored == E5SslErrorState.NOT_IGNORED:
 self.__downloadCancelled = True
 #######################################
 ## Below are methods for various checks
 #######################################
 ##########################################
 ## Support for desktop notifications below
 ##########################################
 def showNotification(self, icon, heading, text,
-kind=NotificationTypes.Information, timeout=None):
+kind=NotificationTypes.INFORMATION, timeout=None):
 """
 Public method to show a desktop notification.
 @param icon icon to be shown in the notification
 @type QPixmap

Mercurial Repositories > eric / file comparison

comparison: eric6/UI/UserInterface.py

eric6/UI/UserInterface.py