style fix

horazont · Jul 4, 2017 · a6ef8d5 · a6ef8d5
1 parent 434b9ea
commit a6ef8d5
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/aioxmpp/bookmarks/service.py b/aioxmpp/bookmarks/service.py
@@ -387,26 +387,28 @@ def discard_bookmark(self, bookmark_to_remove, *, max_retries=3):
             occurences = bookmarks.count(bookmark_to_remove)
 
             try:
-                if occurences:
+                if not occurences:
+                    return
+
+                modified_bookmarks = list(bookmarks)
+                modified_bookmarks.remove(bookmark_to_remove)
+                yield from self._set_bookmarks(modified_bookmarks)
+
+                retries = 0
+                bookmarks = yield from self._get_bookmarks()
+                new_occurences = bookmarks.count(bookmark_to_remove)
+                while retries < max_retries:
+                    if new_occurences < occurences:
+                        break
                     modified_bookmarks = list(bookmarks)
                     modified_bookmarks.remove(bookmark_to_remove)
                     yield from self._set_bookmarks(modified_bookmarks)
-
-                    retries = 0
                     bookmarks = yield from self._get_bookmarks()
                     new_occurences = bookmarks.count(bookmark_to_remove)
-                    while retries < max_retries:
-                        if new_occurences < occurences:
-                            break
-                        modified_bookmarks = list(bookmarks)
-                        modified_bookmarks.remove(bookmark_to_remove)
-                        yield from self._set_bookmarks(modified_bookmarks)
-                        bookmarks = yield from self._get_bookmarks()
-                        new_occurences = bookmarks.count(bookmark_to_remove)
-                        retries += 1
-
-                    if new_occurences >= occurences:
-                        raise RuntimeError("Could not remove bookmark")
+                    retries += 1
+
+                if new_occurences >= occurences:
+                    raise RuntimeError("Could not remove bookmark")
             finally:
                 self._diff_emit_update(bookmarks)