From a55088ead4fd9484fba3c853468ffceae461d52a Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Thu, 15 Dec 2011 14:54:32 +0900
Subject: [PATCH] don't need to cache model anymore

---
 anki/cards.py | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/anki/cards.py b/anki/cards.py
index f3b1c5f4f..d796a9eae 100644
--- a/anki/cards.py
+++ b/anki/cards.py
@@ -22,7 +22,7 @@ class Card(object):
         self.col = col
         self.timerStarted = None
         self._qa = None
-        self._rd = None
+        self._note = None
         if id:
             self.id = id
             self.load()
@@ -62,7 +62,7 @@ class Card(object):
          self.data) = self.col.db.first(
              "select * from cards where id = ?", self.id)
         self._qa = None
-        self._rd = None
+        self._note = None
 
     def flush(self):
         self.mod = intTime()
@@ -114,25 +114,19 @@ lapses=?, left=?, edue=? where id = ?""",
             self._qa = self.col._renderQA(data)
         return self._qa
 
-    def _reviewData(self, reload=False):
-        "Fetch the model and note."
-        if not self._rd or reload:
-            f = self.col.getNote(self.nid)
-            m = self.col.models.get(f.mid)
-            self._rd = [f, m]
-        return self._rd
+    def note(self, reload=False):
+        if not self._note or reload:
+            self._note = self.col.getNote(self.nid)
+        return self._note
 
-    def note(self):
-        return self._reviewData()[0]
-
-    def model(self, reload=False):
-        return self._reviewData()[1]
+    def model(self):
+        return self.col.models.get(self.note().mid)
 
     def deckConf(self):
         return self.col.decks.confForDid(self.did)
 
     def template(self):
-        return self._reviewData()[1]['tmpls'][self.ord]
+        return self.model()['tmpls'][self.ord]
 
     def startTimer(self):
         self.timerStarted = time.time()