From c3aed57df5652882b434386bfbf2c4310f66d2c3 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Wed, 4 Jul 2012 19:42:24 +0900 Subject: [PATCH] silently ignore attempt to delete default deck users can nest the default deck, so we don't want to throw an error when they delete a top level deck which the default deck happens to be under --- anki/decks.py | 3 ++- tests/test_decks.py | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/anki/decks.py b/anki/decks.py index fe116e32f..aacbe7cf1 100644 --- a/anki/decks.py +++ b/anki/decks.py @@ -134,7 +134,8 @@ class DeckManager(object): def rem(self, did, cardsToo=False, childrenToo=True): "Remove the deck. If cardsToo, delete any cards inside." - assert str(did) != '1' + if str(did) == '1': + return # log the removal regardless of whether we have the deck or not self.col._logRem([did], REM_DECK) # do nothing else if doesn't exist diff --git a/tests/test_decks.py b/tests/test_decks.py index ac012f65e..dfdae55d8 100644 --- a/tests/test_decks.py +++ b/tests/test_decks.py @@ -43,8 +43,6 @@ def test_basic(): def test_remove(): deck = getEmptyDeck() - # can't remove the default deck - assertException(AssertionError, lambda: deck.decks.rem(1)) # create a new deck, and add a note/card to it g1 = deck.decks.id("g1") f = deck.newNote()