From 20ffbd57a7bff28603c3f41e7080cc7471162be9 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Fri, 9 Dec 2011 08:36:00 +0900
Subject: [PATCH] don't need relearn flag, can infer from empty delays list

---
 anki/decks.py       | 1 -
 anki/sched.py       | 6 +++---
 tests/test_sched.py | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/anki/decks.py b/anki/decks.py
index ec8821cdd..831dcf9dd 100644
--- a/anki/decks.py
+++ b/anki/decks.py
@@ -32,7 +32,6 @@ defaultConf = {
         'delays': [1, 10],
         'mult': 0,
         'minInt': 1,
-        'relearn': True,
         'leechFails': 8,
         # type 0=suspend, 1=tagonly
         'leechAction': 0,
diff --git a/anki/sched.py b/anki/sched.py
index 567c2d9c7..919fb3aaa 100644
--- a/anki/sched.py
+++ b/anki/sched.py
@@ -557,14 +557,14 @@ did = ? and queue = 2 and due <= ? %s limit ?""" % order,
         card.factor = max(1300, card.factor-200)
         card.due = self.today + card.ivl
         # put back in the learn queue?
-        if conf['relearn']:
+        if conf['delays']:
             card.edue = card.due
             card.due = int(self._delayForGrade(conf, 0) + time.time())
             card.left = len(conf['delays'])
             card.queue = 1
             self.lrnCount += card.left
         # leech?
-        if not self._checkLeech(card, conf) and conf['relearn']:
+        if not self._checkLeech(card, conf) and conf['delays']:
             heappush(self._lrnQueue, (card.due, card.id))
 
     def _nextLapseIvl(self, card, conf):
@@ -763,7 +763,7 @@ your short-term review workload will become."""))
         elif ease == 1:
             # lapsed
             conf = self._cardConf(card)['lapse']
-            if conf['relearn']:
+            if conf['delays']:
                 return conf['delays'][0]*60
             return self._nextLapseIvl(card, conf)*86400
         else:
diff --git a/tests/test_sched.py b/tests/test_sched.py
index 50fd8ab78..bd848e7f7 100644
--- a/tests/test_sched.py
+++ b/tests/test_sched.py
@@ -349,7 +349,7 @@ def test_nextIvl():
     # failing it should put it at 60s
     assert ni(c, 1) == 60
     # or 1 day if relearn is false
-    d.sched._cardConf(c)['lapse']['relearn']=False
+    d.sched._cardConf(c)['lapse']['delays']=[]
     assert ni(c, 1) == 1*86400
     # (* 100 1.2 86400)10368000.0
     assert ni(c, 2) == 10368000