Mercurial Repositories > eric / file diff

diff -r fb0ef164f536 -r 698ae46f40a4 eric6/WebBrowser/Bookmarks/BookmarksManager.py
--- a/eric6/WebBrowser/Bookmarks/BookmarksManager.py	Fri Apr 02 11:59:41 2021 +0200
+++ b/eric6/WebBrowser/Bookmarks/BookmarksManager.py	Sat May 01 14:27:20 2021 +0200
@@ -8,6 +8,7 @@
 """
 
 import os
+import contextlib
 
 from PyQt5.QtCore import (
     pyqtSignal, QT_TRANSLATE_NOOP, QObject, QFile, QIODevice, QXmlStreamReader,
@@ -55,7 +56,7 @@
         
         @param parent reference to the parent object (QObject)
         """
-        super(BookmarksManager, self).__init__(parent)
+        super().__init__(parent)
         
         self.__saveTimer = AutoSaver(self, self.save)
         self.entryAdded.connect(self.__saveTimer.changeOccurred)
@@ -323,12 +324,9 @@
         @param node reference to the node to be changed (BookmarkNode)
         @param count visit count to be set (int or str)
         """
-        try:
+        with contextlib.suppress(ValueError):
             node.visitCount = int(count)
             self.__saveTimer.changeOccurred()
-        except ValueError:
-            # ignore invalid values
-            pass
     
     def bookmarks(self):
         """
@@ -467,9 +465,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 +510,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
 
 
@@ -529,7 +531,7 @@
         @param parent reference to the parent node (BookmarkNode)
         @param row row number of bookmark (integer)
         """
-        super(RemoveBookmarksCommand, self).__init__(
+        super().__init__(
             QCoreApplication.translate("BookmarksManager", "Remove Bookmark"))
         
         self._row = row
@@ -603,7 +605,7 @@
         @param title flag indicating a change of the title (True) or
             the URL (False) (boolean)
         """
-        super(ChangeBookmarkCommand, self).__init__()
+        super().__init__()
         
         self._bookmarksManager = bookmarksManager
         self._title = title