Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/WebBrowserTabWidget.py	Fri Apr 02 11:59:41 2021 +0200
+++ b/eric6/WebBrowser/WebBrowserTabWidget.py	Sat May 01 14:27:20 2021 +0200
@@ -81,7 +81,7 @@
         
         @param parent reference to the parent widget (QWidget)
         """
-        super(WebBrowserTabWidget, self).__init__(parent, dnd=True)
+        super().__init__(parent, dnd=True)
         
         from .WebBrowserTabBar import WebBrowserTabBar
         self.__tabBar = WebBrowserTabBar(self)
@@ -445,18 +445,15 @@
             browser.page().recentlyAudibleChanged.connect(
                 lambda audible: self.__recentlyAudibleChanged(
                     audible, browser.page()))
-        try:
-            browser.page().printRequested.connect(
-                lambda: self.printBrowser(browser))
-        except AttributeError:
-            # pre Qt 5.12
-            pass
+        browser.page().printRequested.connect(
+            lambda: self.printBrowser(browser))
         browser.showMessage.connect(self.showMessage)
         
-        if position == -1:
-            index = self.addTab(browser, self.tr("..."))
-        else:
-            index = self.insertTab(position, browser, self.tr("..."))
+        index = (
+            self.addTab(browser, self.tr("..."))
+            if position == -1 else
+            self.insertTab(position, browser, self.tr("..."))
+        )
         if not background:
             self.setCurrentIndex(index)
         
@@ -464,14 +461,13 @@
         self.__mainWindow.closeAllAct.setEnabled(True)
         self.__navigationButton.setEnabled(True)
         
-        if not restoreSession:
-            if not linkName:
-                if Preferences.getWebBrowser("NewTabBehavior") == 0:
-                    linkName = "about:blank"
-                elif Preferences.getWebBrowser("NewTabBehavior") == 1:
-                    linkName = Preferences.getWebBrowser("HomePage")
-                elif Preferences.getWebBrowser("NewTabBehavior") == 2:
-                    linkName = "eric:speeddial"
+        if not restoreSession and not linkName:
+            if Preferences.getWebBrowser("NewTabBehavior") == 0:
+                linkName = "about:blank"
+            elif Preferences.getWebBrowser("NewTabBehavior") == 1:
+                linkName = Preferences.getWebBrowser("HomePage")
+            elif Preferences.getWebBrowser("NewTabBehavior") == 2:
+                linkName = "eric:speeddial"
         
         if linkName == "eric:blank":
             linkName = "about:blank"
@@ -505,10 +501,7 @@
         @return reference to the new browser
         @rtype WebBrowserView
         """
-        if browser:
-            position = self.indexOf(browser) + 1
-        else:
-            position = -1
+        position = self.indexOf(browser) + 1 if browser else -1
         return self.newBrowser(link, position, background)
     
     def __showNavigationMenu(self):
@@ -1152,15 +1145,13 @@
             maxWidth = fm.width('m') * 40
         
         self.__closedTabsMenu.clear()
-        index = 0
-        for tab in self.__closedTabsManager.allClosedTabs():
+        for index, tab in enumerate(self.__closedTabsManager.allClosedTabs()):
             title = fm.elidedText(tab.title, Qt.TextElideMode.ElideRight,
                                   maxWidth)
             act = self.__closedTabsMenu.addAction(
                 self.__mainWindow.icon(tab.url), title)
             act.setData(index)
             act.triggered.connect(lambda: self.restoreClosedTab(act))
-            index += 1
         self.__closedTabsMenu.addSeparator()
         self.__closedTabsMenu.addAction(
             self.tr("Restore All Closed Tabs"), self.restoreAllClosedTabs)