Mercurial Repositories > eric / changeset

--- a/eric6/Snapshot/SnapWidget.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/Snapshot/SnapWidget.py	Mon Apr 12 19:05:23 2021 +0200
@@ -65,10 +65,12 @@
         if SnapshotModes.Fullscreen in supportedModes:
             self.modeCombo.addItem(self.tr("Fullscreen"),
                                    SnapshotModes.Fullscreen)
-        if SnapshotModes.SelectedScreen in supportedModes:
-            if len(QApplication.screens()) > 1:
-                self.modeCombo.addItem(self.tr("Select Screen"),
-                                       SnapshotModes.SelectedScreen)
+        if (
+            SnapshotModes.SelectedScreen in supportedModes and
+            len(QApplication.screens()) > 1
+        ):
+            self.modeCombo.addItem(self.tr("Select Screen"),
+                                   SnapshotModes.SelectedScreen)
         if SnapshotModes.SelectedWindow in supportedModes:
             self.modeCombo.addItem(self.tr("Select Window"),
                                    SnapshotModes.SelectedWindow)

--- a/eric6/Templates/TemplateViewer.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/Templates/TemplateViewer.py	Mon Apr 12 19:05:23 2021 +0200
@@ -124,12 +124,12 @@
             self.takeChild(index)
             del self.entries[name]
             
-            if len(self.entries) == 0:
-                if (
-                    Preferences.getTemplates("AutoOpenGroups") and
-                    self.isExpanded()
-                ):
-                    self.setExpanded(False)
+            if (
+                len(self.entries) == 0 and
+                Preferences.getTemplates("AutoOpenGroups") and
+                self.isExpanded()
+            ):
+                self.setExpanded(False)
     
     def removeAllEntries(self):
         """

--- a/eric6/UI/Browser.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/UI/Browser.py	Mon Apr 12 19:05:23 2021 +0200
@@ -580,9 +580,8 @@
         itmList = self.getSelectedItems([BrowserFileItem])
         
         for itm in itmList:
-            if isinstance(itm, BrowserFileItem):
-                if itm.isPixmapFile():
-                    self.pixmapEditFile.emit(itm.fileName())
+            if isinstance(itm, BrowserFileItem) and itm.isPixmapFile():
+                self.pixmapEditFile.emit(itm.fileName())
         
     def _openHexEditor(self):
         """

--- a/eric6/UI/BrowserModel.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/UI/BrowserModel.py	Mon Apr 12 19:05:23 2021 +0200
@@ -1105,9 +1105,11 @@
         @param order sort order (Qt.SortOrder) (for special sorting)
         @return true, if this item is less than other (boolean)
         """
-        if issubclass(other.__class__, BrowserFileItem):
-            if Preferences.getUI("BrowsersListFoldersFirst"):
-                return order == Qt.SortOrder.AscendingOrder
+        if (
+            issubclass(other.__class__, BrowserFileItem) and
+            Preferences.getUI("BrowsersListFoldersFirst")
+        ):
+            return order == Qt.SortOrder.AscendingOrder
         
         return BrowserItem.lessThan(self, other, column, order)
 
@@ -1414,9 +1416,11 @@
         @param order sort order (Qt.SortOrder) (for special sorting)
         @return true, if this item is less than other (boolean)
         """
-        if not issubclass(other.__class__, BrowserFileItem):
-            if Preferences.getUI("BrowsersListFoldersFirst"):
-                return order == Qt.SortOrder.DescendingOrder
+        if (
+            not issubclass(other.__class__, BrowserFileItem) and
+            Preferences.getUI("BrowsersListFoldersFirst")
+        ):
+            return order == Qt.SortOrder.DescendingOrder
         
         if issubclass(other.__class__, BrowserFileItem):
             sinit = os.path.basename(self._filename).startswith('__init__.py')

--- a/eric6/UI/CodeDocumentationViewer.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/UI/CodeDocumentationViewer.py	Mon Apr 12 19:05:23 2021 +0200
@@ -290,12 +290,14 @@
         
         self.providerAdded.emit()
         
-        if self.__unregisterTimer.isActive():
-            if providerName == self.__mostRecentlyUnregisteredProvider:
-                # this is assumed to be a plug-in reload
-                self.__unregisterTimer.stop()
-                self.__mostRecentlyUnregisteredProvider = None
-                self.__selectProvider(providerName)
+        if (
+            self.__unregisterTimer.isActive() and
+            providerName == self.__mostRecentlyUnregisteredProvider
+        ):
+            # this is assumed to be a plug-in reload
+            self.__unregisterTimer.stop()
+            self.__mostRecentlyUnregisteredProvider = None
+            self.__selectProvider(providerName)
     
     def unregisterProvider(self, providerName):
         """

--- a/eric6/UI/LogView.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/UI/LogView.py	Mon Apr 12 19:05:23 2021 +0200
@@ -317,16 +317,19 @@
                 self.selectAll()
                 evt.accept()
                 return
-        elif evt.modifiers() == Qt.KeyboardModifier.NoModifier:
-            if evt.key() == Qt.Key.Key_F3 and self.__lastSearch:
-                self.searchNext(*self.__lastSearch)
-                evt.accept()
-                return
+        elif (
+            evt.modifiers() == Qt.KeyboardModifier.NoModifier and
+            evt.key() == Qt.Key.Key_F3 and
+            self.__lastSearch
+        ):
+            self.searchNext(*self.__lastSearch)
+            evt.accept()
+            return
         elif (
             evt.modifiers() == Qt.KeyboardModifier.ShiftModifier and
+            evt.key() == Qt.Key.Key_F3 and
             self.__lastSearch
         ):
-            if evt.key() == Qt.Key.Key_F3 and self.__lastSearch:
-                self.searchPrev(*self.__lastSearch)
-                evt.accept()
-                return
+            self.searchPrev(*self.__lastSearch)
+            evt.accept()
+            return

--- a/eric6/UI/Previewers/PreviewerHTML.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/UI/Previewers/PreviewerHTML.py	Mon Apr 12 19:05:23 2021 +0200
@@ -688,10 +688,12 @@
         extensions = []
         
         mermaidNeeded = False
-        if Preferences.getEditor("PreviewMarkdownMermaid"):
-            if MarkdownExtensions.MermaidRegexFullText.search(text):
-                extensions.append(MarkdownExtensions.MermaidExtension())
-                mermaidNeeded = True
+        if (
+            Preferences.getEditor("PreviewMarkdownMermaid") and
+            MarkdownExtensions.MermaidRegexFullText.search(text)
+        ):
+            extensions.append(MarkdownExtensions.MermaidExtension())
+            mermaidNeeded = True
         
         if convertNewLineToBreak:
             extensions.append('nl2br')

--- a/eric6/UI/PythonDisViewer.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/UI/PythonDisViewer.py	Mon Apr 12 19:05:23 2021 +0200
@@ -504,66 +504,66 @@
         @param disassembly dictionary containing the disassembly information
         @type dict
         """
-        if self.__mode == PythonDisViewerModes.TracebackMode:
-            if (
-                disassembly and
-                "instructions" in disassembly and
-                disassembly["instructions"]
-            ):
-                self.disWidget.clear()
-                
-                self.setUpdatesEnabled(False)
-                block = self.disWidget.blockSignals(True)
-                
-                titleItem = self.__createTitleItem(
-                    self.tr("Disassembly of last traceback"),
-                    disassembly["firstlineno"],
-                    self.disWidget
+        if (
+            self.__mode == PythonDisViewerModes.TracebackMode and
+            disassembly and
+            "instructions" in disassembly and
+            disassembly["instructions"]
+        ):
+            self.disWidget.clear()
+            
+            self.setUpdatesEnabled(False)
+            block = self.disWidget.blockSignals(True)
+            
+            titleItem = self.__createTitleItem(
+                self.tr("Disassembly of last traceback"),
+                disassembly["firstlineno"],
+                self.disWidget
+            )
+            
+            lasti = disassembly["lasti"]
+            lastStartItem = None
+            for instrDict in disassembly["instructions"]:
+                instr = dis.Instruction(
+                    instrDict["opname"],
+                    0,                              # dummy value
+                    instrDict["arg"],
+                    "",                             # dummy value
+                    instrDict["argrepr"],
+                    instrDict["offset"],
+                    instrDict["lineno"],
+                    instrDict["isJumpTarget"],
                 )
-                
-                lasti = disassembly["lasti"]
-                lastStartItem = None
-                for instrDict in disassembly["instructions"]:
-                    instr = dis.Instruction(
-                        instrDict["opname"],
-                        0,                              # dummy value
-                        instrDict["arg"],
-                        "",                             # dummy value
-                        instrDict["argrepr"],
-                        instrDict["offset"],
-                        instrDict["lineno"],
-                        instrDict["isJumpTarget"],
-                    )
-                    if instrDict["lineno"] > 0:
-                        if lastStartItem:
-                            self.__updateItemEndLine(lastStartItem)
-                        lastStartItem = self.__createInstructionItem(
-                            instr, titleItem, lasti=lasti)
-                    else:
-                        self.__createInstructionItem(
-                            instr, lastStartItem, lasti=lasti)
-                if lastStartItem:
-                    self.__updateItemEndLine(lastStartItem)
-                
-                QTimer.singleShot(0, self.__resizeDisColumns)
-                
-                self.disWidget.blockSignals(block)
-                self.setUpdatesEnabled(True)
-                
-                if lasti:
-                    lastInstructions = self.disWidget.findItems(
-                        "{0:d}".format(lasti),
-                        Qt.MatchFlag.MatchFixedString |
-                        Qt.MatchFlag.MatchRecursive,
-                        1
-                    )
-                    if lastInstructions:
-                        self.disWidget.scrollToItem(
-                            lastInstructions[0],
-                            QAbstractItemView.ScrollHint.PositionAtCenter)
-                
-                if "codeinfo" in disassembly:
-                    self.__showCodeInfoData(disassembly["codeinfo"])
+                if instrDict["lineno"] > 0:
+                    if lastStartItem:
+                        self.__updateItemEndLine(lastStartItem)
+                    lastStartItem = self.__createInstructionItem(
+                        instr, titleItem, lasti=lasti)
+                else:
+                    self.__createInstructionItem(
+                        instr, lastStartItem, lasti=lasti)
+            if lastStartItem:
+                self.__updateItemEndLine(lastStartItem)
+            
+            QTimer.singleShot(0, self.__resizeDisColumns)
+            
+            self.disWidget.blockSignals(block)
+            self.setUpdatesEnabled(True)
+            
+            if lasti:
+                lastInstructions = self.disWidget.findItems(
+                    "{0:d}".format(lasti),
+                    Qt.MatchFlag.MatchFixedString |
+                    Qt.MatchFlag.MatchRecursive,
+                    1
+                )
+                if lastInstructions:
+                    self.disWidget.scrollToItem(
+                        lastInstructions[0],
+                        QAbstractItemView.ScrollHint.PositionAtCenter)
+            
+            if "codeinfo" in disassembly:
+                self.__showCodeInfoData(disassembly["codeinfo"])
     
     def __resizeDisColumns(self):
         """

--- a/eric6/UI/SymbolsWidget.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/UI/SymbolsWidget.py	Mon Apr 12 19:05:23 2021 +0200
@@ -373,9 +373,11 @@
             elif col == 4:
                 return unicodedata.name(chr(symbolId), '').title()
         
-        if role == Qt.ItemDataRole.BackgroundColorRole:
-            if index.column() == 0:
-                return QColor(Qt.GlobalColor.lightGray)
+        if (
+            role == Qt.ItemDataRole.BackgroundColorRole and
+            index.column() == 0
+        ):
+            return QColor(Qt.GlobalColor.lightGray)
         
         if role == Qt.ItemDataRole.TextColorRole:
             char = chr(symbolId)
@@ -392,9 +394,11 @@
             else:
                 return QColor(Qt.GlobalColor.darkGray)
         
-        if role == Qt.ItemDataRole.TextAlignmentRole:
-            if index.column() in [0, 1, 3]:
-                return Qt.AlignmentFlag.AlignHCenter
+        if (
+            role == Qt.ItemDataRole.TextAlignmentRole and
+            index.column() in [0, 1, 3]
+        ):
+            return Qt.AlignmentFlag.AlignHCenter
         
         return None
     

--- a/eric6/UI/UserInterface.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/UI/UserInterface.py	Mon Apr 12 19:05:23 2021 +0200
@@ -200,7 +200,7 @@
         
         self.maxEditorPathLen = Preferences.getUI("CaptionFilenameLength")
         self.locale = locale
-        self.__noOpenAtStartup = noOpenAtStartup
+        self.__openAtStartup = not noOpenAtStartup
         self.__noCrashOpenAtStartup = noCrashOpenAtStartup
         self.__disableCrashSession = disableCrashSession
         self.__disabledPlugins = disabledPlugins[:]
@@ -1392,7 +1392,7 @@
         
         # no args, return
         if args is None:
-            if not self.__noOpenAtStartup:
+            if self.__openAtStartup:
                 self.__openOnStartup()
             return
         
@@ -1458,10 +1458,9 @@
         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):
         """
@@ -6952,9 +6951,8 @@
         if self.__webBrowserProcess is not None:
             self.__webBrowserShutdown()
         
-        if self.irc is not None:
-            if not self.irc.shutdown():
-                return False
+        if self.irc is not None and not self.irc.shutdown():
+            return False
         
         sessionCreated = self.__writeSession()
         

--- a/eric6/Utilities/PasswordChecker.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/Utilities/PasswordChecker.py	Mon Apr 12 19:05:23 2021 +0200
@@ -356,14 +356,18 @@
                     fwd = pattern[index:index +
                                   self.keyboardPatterns["length"]]
                     rev = self.__strReverse(fwd)
-                    if lowercasedPassword.find(fwd) != -1:
-                        if fwd not in patternsMatched:
-                            self.keyboardPatterns["count"] += 1
-                            patternsMatched.append(fwd)
-                    if lowercasedPassword.find(rev) != -1:
-                        if fwd not in patternsMatched:
-                            self.keyboardPatterns["count"] += 1
-                            patternsMatched.append(rev)
+                    if (
+                        lowercasedPassword.find(fwd) != -1 and
+                        fwd not in patternsMatched
+                    ):
+                        self.keyboardPatterns["count"] += 1
+                        patternsMatched.append(fwd)
+                    if (
+                        lowercasedPassword.find(rev) != -1 and
+                        fwd not in patternsMatched
+                    ):
+                        self.keyboardPatterns["count"] += 1
+                        patternsMatched.append(rev)
         
         # Try to find repeated sequences of characters.
         if self.passwordLength["count"] >= self.repeatedSequences["length"]:
@@ -640,11 +644,14 @@
         
         # apply the redundancy
         # is the password length requirement fulfilled?
-        if self.recommendedPasswordLength["status"] != self.Status_Exceeded:
+        if (
+            self.recommendedPasswordLength[
+                "status"] != self.Status_Exceeded and
+            self.score["count"] > 0
+        ):
             # full penalty, because password is not long enough, only for
             # a positive score
-            if self.score["count"] > 0:
-                self.score["count"] *= 1.0 / self.redundancy["value"]
+            self.score["count"] *= 1.0 / self.redundancy["value"]
         
         # level it out
         if self.score["count"] > 100:

--- a/eric6/ViewManager/ViewManager.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/ViewManager/ViewManager.py	Mon Apr 12 19:05:23 2021 +0200
@@ -6997,7 +6997,6 @@
                 txt = aw.selectedText()
         else:
             aw = self.activeWindow()
-            if aw is not None:
-                if aw.hasSelectedText():
-                    txt = aw.selectedText()
+            if aw is not None and aw.hasSelectedText():
+                txt = aw.selectedText()
         return txt

--- a/eric6/WebBrowser/Bookmarks/BookmarksManager.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/WebBrowser/Bookmarks/BookmarksManager.py	Mon Apr 12 19:05:23 2021 +0200
@@ -467,9 +467,11 @@
         for node in startNode.children():
             if node.type() == BookmarkNode.Folder:
                 bm = self.__searchBookmark(url, node)
-            elif node.type() == BookmarkNode.Bookmark:
-                if node.url == url:
-                    bm = node
+            elif (
+                node.type() == BookmarkNode.Bookmark and
+                node.url == url
+            ):
+                bm = node
             if bm is not None:
                 return bm
         return None
@@ -510,9 +512,11 @@
         for node in startNode.children():
             if node.type() == BookmarkNode.Folder:
                 bm.extend(self.__searchBookmarks(url, node))
-            elif node.type() == BookmarkNode.Bookmark:
-                if node.url == url:
-                    bm.append(node)
+            elif (
+                node.type() == BookmarkNode.Bookmark and
+                node.url == url
+            ):
+                bm.append(node)
         return bm
 
 

--- a/eric6/WebBrowser/Download/DownloadItem.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/WebBrowser/Download/DownloadItem.py	Mon Apr 12 19:05:23 2021 +0200
@@ -245,15 +245,17 @@
         
         # check file path for saving
         saveDirPath = QFileInfo(self.__fileName).dir()
-        if not saveDirPath.exists():
-            if not saveDirPath.mkpath(saveDirPath.absolutePath()):
-                self.progressBar.setVisible(False)
-                self.on_stopButton_clicked()
-                self.infoLabel.setText(self.tr(
-                    "Download directory ({0}) couldn't be created.")
-                    .format(saveDirPath.absolutePath()))
-                self.__setDateTime()
-                return
+        if (
+            not saveDirPath.exists() and
+            not saveDirPath.mkpath(saveDirPath.absolutePath())
+        ):
+            self.progressBar.setVisible(False)
+            self.on_stopButton_clicked()
+            self.infoLabel.setText(self.tr(
+                "Download directory ({0}) couldn't be created.")
+                .format(saveDirPath.absolutePath()))
+            self.__setDateTime()
+            return
         
         self.filenameLabel.setText(QFileInfo(self.__fileName).fileName())
     

--- a/eric6/WebBrowser/Download/DownloadModel.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/WebBrowser/Download/DownloadModel.py	Mon Apr 12 19:05:23 2021 +0200
@@ -41,12 +41,11 @@
         if index.row() < 0 or index.row() >= self.rowCount(index.parent()):
             return None
         
-        if role == Qt.ItemDataRole.ToolTipRole:
-            if (
-                self.__manager.downloads()[index.row()]
-                .downloadedSuccessfully()
-            ):
-                return self.__manager.downloads()[index.row()].getInfoData()
+        if (
+            role == Qt.ItemDataRole.ToolTipRole and
+            self.__manager.downloads()[index.row()].downloadedSuccessfully()
+        ):
+            return self.__manager.downloads()[index.row()].getInfoData()
         
         return None
     

--- a/eric6/WebBrowser/FeaturePermissions/FeaturePermissionManager.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/WebBrowser/FeaturePermissions/FeaturePermissionManager.py	Mon Apr 12 19:05:23 2021 +0200
@@ -184,10 +184,12 @@
         @param permission feature permission to be remembered
         @type QWebEnginePage.PermissionPolicy
         """
-        if feature in self.__featurePermissions:
-            if host not in self.__featurePermissions[feature][permission]:
-                self.__featurePermissions[feature][permission].append(host)
-                self.__saveSettings()
+        if (
+            feature in self.__featurePermissions and
+            host not in self.__featurePermissions[feature][permission]
+        ):
+            self.__featurePermissions[feature][permission].append(host)
+            self.__saveSettings()
     
     def __loadSettings(self):
         """

--- a/eric6/WebBrowser/History/HistoryMenu.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/WebBrowser/History/HistoryMenu.py	Mon Apr 12 19:05:23 2021 +0200
@@ -92,9 +92,11 @@
                 folders -= 1
             return bumpedItems + folders
         
-        if parent.internalId() == sys.maxsize:
-            if parent.row() < self.bumpedRows():
-                return 0
+        if (
+            parent.internalId() == sys.maxsize and
+            parent.row() < self.bumpedRows()
+        ):
+            return 0
         
         idx = self.mapToSource(parent)
         defaultCount = self.sourceModel().rowCount(idx)

--- a/eric6/WebBrowser/History/HistoryModel.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/WebBrowser/History/HistoryModel.py	Mon Apr 12 19:05:23 2021 +0200
@@ -122,10 +122,12 @@
                 return itm.url
             elif index.column() == 2:
                 return itm.visitCount
-        elif role == Qt.ItemDataRole.DecorationRole:
-            if index.column() == 0:
-                return WebBrowser.WebBrowserWindow.WebBrowserWindow.icon(
-                    QUrl(itm.url))
+        elif (
+            role == Qt.ItemDataRole.DecorationRole and
+            index.column() == 0
+        ):
+            return WebBrowser.WebBrowserWindow.WebBrowserWindow.icon(
+                QUrl(itm.url))
         
         return None
     

--- a/eric6/WebBrowser/History/HistoryTreeModel.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/WebBrowser/History/HistoryTreeModel.py	Mon Apr 12 19:05:23 2021 +0200
@@ -69,15 +69,21 @@
                         "%n item(s)", "",
                         self.rowCount(index.sibling(index.row(), 0)))
         
-        elif role == Qt.ItemDataRole.DecorationRole:
-            if index.column() == 0 and not index.parent().isValid():
-                return UI.PixmapCache.getIcon("history")
+        elif (
+            role == Qt.ItemDataRole.DecorationRole and
+            index.column() == 0 and
+            not index.parent().isValid()
+        ):
+            return UI.PixmapCache.getIcon("history")
         
-        elif role == HistoryModel.DateRole:
-            if index.column() == 0 and index.internalId() == 0:
-                offset = self.__sourceDateRow(index.row())
-                idx = self.sourceModel().index(offset, 0)
-                return idx.data(HistoryModel.DateRole)
+        elif (
+            role == HistoryModel.DateRole and
+            index.column() == 0 and
+            index.internalId() == 0
+        ):
+            offset = self.__sourceDateRow(index.row())
+            idx = self.sourceModel().index(offset, 0)
+            return idx.data(HistoryModel.DateRole)
         
         return QAbstractProxyModel.data(self, index, role)
     

--- a/eric6/WebBrowser/Network/QtHelpSchemeHandler.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/WebBrowser/Network/QtHelpSchemeHandler.py	Mon Apr 12 19:05:23 2021 +0200
@@ -136,13 +136,15 @@
         # One possible problem might be that the css is loaded at the same
         # level as the html, thus a path inside the css like
         # (../images/foo.png) might cd out of the virtual folder
-        if not self.__engine.findFile(url).isValid():
-            if strUrl.startswith(QtDocPath):
-                newUrl = self.__job.requestUrl()
-                if not newUrl.path().startswith("/qdoc/"):
-                    newUrl.setPath("/qdoc" + newUrl.path())
-                    url = newUrl
-                    strUrl = url.toString()
+        if (
+            not self.__engine.findFile(url).isValid() and
+            strUrl.startswith(QtDocPath)
+        ):
+            newUrl = self.__job.requestUrl()
+            if not newUrl.path().startswith("/qdoc/"):
+                newUrl.setPath("/qdoc" + newUrl.path())
+                url = newUrl
+                strUrl = url.toString()
         
         self.__mimeType = mimetypes.guess_type(strUrl)[0]
         if self.__mimeType is None:

--- a/eric6/WebBrowser/OpenSearch/OpenSearchWriter.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/WebBrowser/OpenSearch/OpenSearchWriter.py	Mon Apr 12 19:05:23 2021 +0200
@@ -33,9 +33,11 @@
         if engine is None:
             return False
         
-        if not device.isOpen():
-            if not device.open(QIODevice.OpenModeFlag.WriteOnly):
-                return False
+        if (
+            not device.isOpen() and
+            not device.open(QIODevice.OpenModeFlag.WriteOnly)
+        ):
+            return False
         
         self.setDevice(device)
         self.__write(engine)

--- a/eric6/WebBrowser/PageScreenDialog.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/WebBrowser/PageScreenDialog.py	Mon Apr 12 19:05:23 2021 +0200
@@ -118,8 +118,9 @@
             QDialogButtonBox.StandardButton.Cancel
         ):
             self.reject()
-        elif button == self.buttonBox.button(
-            QDialogButtonBox.StandardButton.Save
+        elif (
+            button == self.buttonBox.button(
+                QDialogButtonBox.StandardButton.Save) and
+            self.__savePageScreen()
         ):
-            if self.__savePageScreen():
-                self.accept()
+            self.accept()

--- a/eric6/WebBrowser/SiteInfo/SiteInfoDialog.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/WebBrowser/SiteInfo/SiteInfoDialog.py	Mon Apr 12 19:05:23 2021 +0200
@@ -114,9 +114,8 @@
             lambda res: self.encodingLabel.setText(res))
         
         # populate the Security tab
-        if sslInfo:
-            if SSL:
-                self.sslWidget.showCertificateChain(sslInfo)
+        if sslInfo and SSL:
+            self.sslWidget.showCertificateChain(sslInfo)
         self.tabWidget.setTabEnabled(2, SSL and bool(sslInfo))
         self.securityDetailsButton.setEnabled(SSL and bool(sslInfo))
         

--- a/eric6/WebBrowser/Sync/FtpSyncHandler.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/WebBrowser/Sync/FtpSyncHandler.py	Mon Apr 12 19:05:23 2021 +0200
@@ -169,11 +169,13 @@
             # silently ignore parser errors
             urlInfo = None
         
-        if urlInfo and urlInfo.isValid() and urlInfo.isFile():
-            if urlInfo.name() in self._remoteFiles.values():
-                self.__remoteFilesFound[urlInfo.name()] = (
-                    urlInfo.lastModified()
-                )
+        if (
+            urlInfo and
+            urlInfo.isValid() and
+            urlInfo.isFile() and
+            urlInfo.name() in self._remoteFiles.values()
+        ):
+            self.__remoteFilesFound[urlInfo.name()] = urlInfo.lastModified()
         
         QCoreApplication.processEvents()
     

--- a/eric6/WebBrowser/WebBrowserTabBar.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/WebBrowser/WebBrowserTabBar.py	Mon Apr 12 19:05:23 2021 +0200
@@ -107,15 +107,13 @@
             if (
                 tabIndex != -1 and
                 tabIndex != self.currentIndex() and
-                evt.buttons() == Qt.MouseButton.NoButton
+                evt.buttons() == Qt.MouseButton.NoButton and
+                (self.__previewPopup is None or
+                 (self.__previewPopup is not None and
+                  self.__previewPopup.getCustomData("index") != tabIndex)
+                 )
             ):
-                if (
-                    self.__previewPopup is None or
-                    (self.__previewPopup is not None and
-                     self.__previewPopup.getCustomData("index") != tabIndex)
-                ):
-                    QTimer.singleShot(
-                        0, lambda: self.__showTabPreview(tabIndex))
+                QTimer.singleShot(0, lambda: self.__showTabPreview(tabIndex))
             
             # If current tab or not found then hide previous tab preview
             if tabIndex in (self.currentIndex(), -1):

--- a/eric6/WebBrowser/WebBrowserTabWidget.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/WebBrowser/WebBrowserTabWidget.py	Mon Apr 12 19:05:23 2021 +0200
@@ -464,14 +464,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"

--- a/eric6/WebBrowser/WebBrowserView.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/WebBrowser/WebBrowserView.py	Mon Apr 12 19:05:23 2021 +0200
@@ -1521,11 +1521,10 @@
         
         @param evt reference to the key event (QKeyEvent)
         """
-        if evt.key() == Qt.Key.Key_Escape:
-            if self.isFullScreen():
-                self.triggerPageAction(QWebEnginePage.WebAction.ExitFullScreen)
-                evt.accept()
-                self.requestFullScreen(False)
+        if evt.key() == Qt.Key.Key_Escape and self.isFullScreen():
+            self.triggerPageAction(QWebEnginePage.WebAction.ExitFullScreen)
+            evt.accept()
+            self.requestFullScreen(False)
     
     def _gestureEvent(self, evt):
         """
@@ -1620,10 +1619,8 @@
                               QEvent.Type.Gesture]:
                 return True
             
-            elif evt.type() == QEvent.Type.Hide:
-                if self.isFullScreen():
-                    self.triggerPageAction(
-                        QWebEnginePage.WebAction.ExitFullScreen)
+            elif evt.type() == QEvent.Type.Hide and self.isFullScreen():
+                self.triggerPageAction(QWebEnginePage.WebAction.ExitFullScreen)
         
         return super().eventFilter(obj, evt)
     

--- a/eric6/WebBrowser/WebBrowserWindow.py	Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/WebBrowser/WebBrowserWindow.py	Mon Apr 12 19:05:23 2021 +0200
@@ -2760,9 +2760,12 @@
         
         @return flag indicating successful shutdown (boolean)
         """
-        if not WebBrowserWindow._performingShutdown and not self.__forcedClose:
-            if not self.__tabWidget.shallShutDown():
-                return False
+        if (
+            not WebBrowserWindow._performingShutdown and
+            not self.__forcedClose and
+            not self.__tabWidget.shallShutDown()
+        ):
+            return False
         
         self.__isClosing = True
         
@@ -2804,19 +2807,18 @@
         
         try:
             browserIndex = WebBrowserWindow.BrowserWindows.index(self)
-            if len(WebBrowserWindow.BrowserWindows):
-                if browserIndex == 0:
-                    if len(WebBrowserWindow.BrowserWindows) > 1:
-                        # first window will be deleted
-                        QDesktopServices.setUrlHandler(
-                            "http",
-                            WebBrowserWindow.BrowserWindows[1].urlHandler)
-                        QDesktopServices.setUrlHandler(
-                            "https",
-                            WebBrowserWindow.BrowserWindows[1].urlHandler)
-                    else:
-                        QDesktopServices.unsetUrlHandler("http")
-                        QDesktopServices.unsetUrlHandler("https")
+            if len(WebBrowserWindow.BrowserWindows) and browserIndex == 0:
+                if len(WebBrowserWindow.BrowserWindows) > 1:
+                    # first window will be deleted
+                    QDesktopServices.setUrlHandler(
+                        "http",
+                        WebBrowserWindow.BrowserWindows[1].urlHandler)
+                    QDesktopServices.setUrlHandler(
+                        "https",
+                        WebBrowserWindow.BrowserWindows[1].urlHandler)
+                else:
+                    QDesktopServices.unsetUrlHandler("http")
+                    QDesktopServices.unsetUrlHandler("https")
             if len(WebBrowserWindow.BrowserWindows) > 0:
                 del WebBrowserWindow.BrowserWindows[browserIndex]
         except ValueError: