Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/Bookmarks/BookmarksModel.py	Thu Apr 08 17:27:12 2021 +0200
+++ b/eric6/WebBrowser/Bookmarks/BookmarksModel.py	Thu Apr 08 18:27:47 2021 +0200
@@ -127,9 +127,9 @@
         bookmarkNode = self.node(parent)
         children = bookmarkNode.children()[row:(row + count)]
         for node in children:
-            if (
-                node == self.__bookmarksManager.menu() or
-                node == self.__bookmarksManager.toolbar()
+            if node in (
+                self.__bookmarksManager.menu(),
+                self.__bookmarksManager.toolbar()
             ):
                 continue
             self.__bookmarksManager.removeBookmark(node)
@@ -201,13 +201,15 @@
         elif role == BookmarksModel.SeparatorRole:
             return bookmarkNode.type() == BookmarkNode.Separator
         
-        elif role == Qt.ItemDataRole.DecorationRole:
-            if index.column() == 0:
-                if bookmarkNode.type() == BookmarkNode.Folder:
-                    return UI.PixmapCache.getIcon("dirOpen")
-                import WebBrowser.WebBrowserWindow
-                return WebBrowser.WebBrowserWindow.WebBrowserWindow.icon(
-                    QUrl(bookmarkNode.url))
+        elif (
+            role == Qt.ItemDataRole.DecorationRole and
+            index.column() == 0
+        ):
+            if bookmarkNode.type() == BookmarkNode.Folder:
+                return UI.PixmapCache.getIcon("dirOpen")
+            import WebBrowser.WebBrowserWindow
+            return WebBrowser.WebBrowserWindow.WebBrowserWindow.icon(
+                QUrl(bookmarkNode.url))
         
         return None
     
@@ -282,10 +284,7 @@
             return QModelIndex()
         
         itemNode = self.node(index)
-        if itemNode is None:
-            parentNode = None
-        else:
-            parentNode = itemNode.parent()
+        parentNode = itemNode.parent() if itemNode else None
         
         if (
             parentNode is None or
@@ -332,9 +331,9 @@
         if self.hasChildren(index):
             flags |= Qt.ItemFlag.ItemIsDropEnabled
         
-        if (
-            node == self.__bookmarksManager.menu() or
-            node == self.__bookmarksManager.toolbar()
+        if node in (
+            self.__bookmarksManager.menu(),
+            self.__bookmarksManager.toolbar()
         ):
             return flags