eric: comparison eric6/WebBrowser/WebBrowserWindow.py

-:fb0ef164f536
+:698ae46f40a4
 import os
 import shutil
 import sys
 import functools
+import contextlib
 from PyQt5.QtCore import (
 pyqtSlot, pyqtSignal, Qt, QByteArray, QSize, QTimer, QUrl, QProcess,
 QEvent, QFileInfo
 )
 @param saname name to be used for the single application server
 @type str
 """
 self.__hideNavigationTimer = None
-super(WebBrowserWindow, self).__init__(parent)
+super().__init__(parent)
 self.setObjectName(name)
 if private:
 self.setWindowTitle(self.tr("eric Web Browser (Private Mode)"))
 else:
 self.setWindowTitle(self.tr("eric Web Browser"))
 Qt.DockWidgetArea.TopDockWidgetArea)
 self.__javascriptConsoleDock.setWidget(self.__javascriptConsole)
 self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea,
 self.__javascriptConsoleDock)
-if Preferences.getWebBrowser("SaveGeometry"):
+g = (
-g = Preferences.getGeometry("WebBrowserGeometry")
+Preferences.getGeometry("WebBrowserGeometry")
-else:
+if Preferences.getWebBrowser("SaveGeometry") else
-g = QByteArray()
+QByteArray()
+)
 if g.isEmpty():
 s = QSize(800, 800)
 self.resize(s)
 else:
 self.restoreGeometry(g)
 settings.setAttribute(
 QWebEngineSettings.WebAttribute.DnsPrefetchEnabled,
 Preferences.getWebBrowser(
 "DnsPrefetchEnabled"))
-try:
+with contextlib.suppress(AttributeError, KeyError):
 # Qt 5.13
 settings.setAttribute(
 QWebEngineSettings.WebAttribute.PdfViewerEnabled,
 Preferences.getWebBrowser(
 "PdfViewerEnabled"))
-except (AttributeError, KeyError):
-pass
 def __initActions(self):
 """
 Private method to define the user interface actions.
 """
 """
 Private method to shut down a web browser window.
 @return flag indicating successful shutdown (boolean)
 """
-if not WebBrowserWindow._performingShutdown and not self.__forcedClose:
+if (
-if not self.__tabWidget.shallShutDown():
+not WebBrowserWindow._performingShutdown and
-return False
+not self.__forcedClose and
+not self.__tabWidget.shallShutDown()
+):
+return False
 self.__isClosing = True
 if (
 not WebBrowserWindow._performingShutdown and
 Preferences.setGeometry("WebBrowserGeometry",
 self.saveGeometry())
 else:
 Preferences.setGeometry("WebBrowserGeometry", QByteArray())
-try:
+with contextlib.suppress(ValueError):
 browserIndex = WebBrowserWindow.BrowserWindows.index(self)
-if len(WebBrowserWindow.BrowserWindows):
+if len(WebBrowserWindow.BrowserWindows) and browserIndex == 0:
-if browserIndex == 0:
+if len(WebBrowserWindow.BrowserWindows) > 1:
-if len(WebBrowserWindow.BrowserWindows) > 1:
+# first window will be deleted
-# first window will be deleted
+QDesktopServices.setUrlHandler(
-QDesktopServices.setUrlHandler(
+"http",
-"http",
+WebBrowserWindow.BrowserWindows[1].urlHandler)
-WebBrowserWindow.BrowserWindows[1].urlHandler)
+QDesktopServices.setUrlHandler(
-QDesktopServices.setUrlHandler(
+"https",
-"https",
+WebBrowserWindow.BrowserWindows[1].urlHandler)
-WebBrowserWindow.BrowserWindows[1].urlHandler)
+else:
-else:
+QDesktopServices.unsetUrlHandler("http")
-QDesktopServices.unsetUrlHandler("http")
+QDesktopServices.unsetUrlHandler("https")
-QDesktopServices.unsetUrlHandler("https")
 if len(WebBrowserWindow.BrowserWindows) > 0:
 del WebBrowserWindow.BrowserWindows[browserIndex]
-except ValueError:
-pass
 Preferences.syncPreferences()
 if (
 not WebBrowserWindow._performingShutdown and
 len(WebBrowserWindow.BrowserWindows) == 0
 def __showPreferences(self):
 """
 Private slot to set the preferences.
 """
-from Preferences.ConfigurationDialog import ConfigurationDialog
+from Preferences.ConfigurationDialog import (
+ConfigurationDialog, ConfigurationMode
+)
 dlg = ConfigurationDialog(
 self, 'Configuration', True, fromEric=False,
-displayMode=ConfigurationDialog.WebBrowserMode)
+displayMode=ConfigurationMode.WEBBROWSERMODE)
 dlg.preferencesChanged.connect(self.preferencesChanged)
 dlg.masterPasswordChanged.connect(
 lambda old, new: self.masterPasswordChanged(old, new, local=True))
 dlg.show()
 if self.__lastConfigurationPageName:
 else:
 profile.setHttpCacheType(
 QWebEngineProfile.HttpCacheType.MemoryHttpCache)
 profile.setHttpCacheMaximumSize(0)
-try:
+with contextlib.suppress(AttributeError):
 profile.setSpellCheckEnabled(
 Preferences.getWebBrowser("SpellCheckEnabled"))
 profile.setSpellCheckLanguages(
 Preferences.getWebBrowser("SpellCheckLanguages"))
-except AttributeError:
-# not yet supported
-pass
 self.__virusTotal.preferencesChanged()
 if (
 not Preferences.getWebBrowser("VirusTotalEnabled") or
 Preferences.getWebBrowser("VirusTotalServiceKey") == ""
 @param parentMenu reference to the parent menu
 @type QMenu
 @param name name for the action
 @type str
 """
-if name:
+act = QAction(name, parentMenu) if name else QAction(codec, parentMenu)
-act = QAction(name, parentMenu)
-else:
-act = QAction(codec, parentMenu)
 act.setData(codec)
 act.setCheckable(True)
 if defaultCodec == codec:
 act.setChecked(True)
 Private slot to populate the text encoding menu.
 """
 self.__textEncodingMenu.clear()
 defaultTextEncoding = self.webSettings().defaultTextEncoding().lower()
-if defaultTextEncoding in Utilities.supportedCodecs:
+currentCodec = (
-currentCodec = defaultTextEncoding
+defaultTextEncoding
-else:
+if defaultTextEncoding in Utilities.supportedCodecs else
-currentCodec = ""
+""
+)
 isoCodecs = []
 winCodecs = []
 uniCodecs = []
 cpCodecs = []
 QWebEnginePage.WebAction.Back)
 elif evt.button() == Qt.MouseButton.XButton2:
 self.currentBrowser().triggerPageAction(
 QWebEnginePage.WebAction.Forward)
 else:
-super(WebBrowserWindow, self).mousePressEvent(evt)
+super().mousePressEvent(evt)
 @classmethod
 def feedsManager(cls):
 """
 Class method to get a reference to the RSS feeds manager.
 url = self.speedDial().urlForShortcut(number - 1)
 if url.isValid():
 self.__linkActivated(url)
 return
-super(WebBrowserWindow, self).keyPressEvent(evt)
+super().keyPressEvent(evt)
 def event(self, evt):
 """
 Public method handling events.
 self.__navigationContainer.show()
 if self.__hideNavigationTimer:
 self.__hideNavigationTimer.stop()
-return super(WebBrowserWindow, self).event(evt)
+return super().event(evt)
 ###########################################################################
 ## Interface to VirusTotal below                                         ##
 ###########################################################################
 ## Support for desktop notifications below
 ##########################################
 @classmethod
 def showNotification(cls, icon, heading, text,
-kind=NotificationTypes.Information, timeout=None):
+kind=NotificationTypes.INFORMATION, timeout=None):
 """
 Class method to show a desktop notification.
 @param icon icon to be shown in the notification
 @type QPixmap
 "persistentstorage"))
 cls._webProfile.setPersistentCookiesPolicy(
 QWebEngineProfile.PersistentCookiesPolicy
 .AllowPersistentCookies)
-try:
+with contextlib.suppress(AttributeError):
 cls._webProfile.setSpellCheckEnabled(
 Preferences.getWebBrowser("SpellCheckEnabled"))
 cls._webProfile.setSpellCheckLanguages(
 Preferences.getWebBrowser("SpellCheckLanguages"))
-except AttributeError:
-# not yet supported
-pass
 # Setup QWebChannel user scripts
 from .WebBrowserPage import WebBrowserPage
 # WebChannel for SafeJsWorld
 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, helpViewer=self)

Mercurial Repositories > eric / file comparison

comparison: eric6/WebBrowser/WebBrowserWindow.py

eric6/WebBrowser/WebBrowserWindow.py