From 93d80678f981c926c6941f24d51669df194a809b Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Wed, 13 Apr 2011 22:42:44 +0900
Subject: [PATCH] _fields -> fields

---
 anki/deck.py         |  2 +-
 anki/facts.py        | 20 ++++++++++----------
 tests/test_models.py | 16 ++++++++--------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/anki/deck.py b/anki/deck.py
index f358fc59e..a198eaac2 100644
--- a/anki/deck.py
+++ b/anki/deck.py
@@ -273,7 +273,7 @@ select id from facts where id not in (select distinct fid from cards)""")
                 data = [1, 1, model.id, 1, template['ord'],
                         "", fact.joinedFields()]
                 now = self._renderQA(model, "", data)
-                data[6] = "\x1f".join([""]*len(fact._fields))
+                data[6] = "\x1f".join([""]*len(fact.fields))
                 empty = self._renderQA(model, "", data)
                 if now['q'] == empty['q']:
                     continue
diff --git a/anki/facts.py b/anki/facts.py
index c543c9775..66f553b41 100644
--- a/anki/facts.py
+++ b/anki/facts.py
@@ -23,7 +23,7 @@ class Fact(object):
             self.crt = intTime()
             self.mod = self.crt
             self.tags = []
-            self._fields = [""] * len(self._model.fields)
+            self.fields = [""] * len(self._model.fields)
             self.data = ""
         self._fmap = self._model.fieldMap()
 
@@ -33,17 +33,17 @@ class Fact(object):
          self.crt,
          self.mod,
          self.tags,
-         self._fields,
+         self.fields,
          self.data) = self.deck.db.first("""
 select mid, gid, crt, mod, tags, flds, data from facts where id = ?""", self.id)
-        self._fields = splitFields(self._fields)
+        self.fields = splitFields(self.fields)
         self.tags = parseTags(self.tags)
         self._model = self.deck.getModel(self.mid)
 
     def flush(self):
         self.mod = intTime()
         # facts table
-        sfld = self._fields[self._model.sortIdx()]
+        sfld = self.fields[self._model.sortIdx()]
         tags = self.stringTags()
         res = self.deck.db.execute("""
 insert or replace into facts values (?, ?, ?, ?, ?, ?, ?, ?, ?)""",
@@ -55,7 +55,7 @@ insert or replace into facts values (?, ?, ?, ?, ?, ?, ?, ?, ?)""",
         self.deck.registerTags(self.tags)
 
     def joinedFields(self):
-        return joinFields(self._fields)
+        return joinFields(self.fields)
 
     def updateFieldChecksums(self):
         self.deck.db.execute("delete from fsums where fid = ?", self.id)
@@ -63,7 +63,7 @@ insert or replace into facts values (?, ?, ?, ?, ?, ?, ?, ?, ?)""",
         for (ord, conf) in self._fmap.values():
             if not conf['uniq']:
                 continue
-            val = self._fields[ord]
+            val = self.fields[ord]
             if not val:
                 continue
             d.append((self.id, self.mid, fieldChecksum(val)))
@@ -89,10 +89,10 @@ insert or replace into facts values (?, ?, ?, ?, ?, ?, ?, ?, ?)""",
         return self._fmap.keys()
 
     def values(self):
-        return self._fields
+        return self.fields
 
     def items(self):
-        return [(f['name'], self._fields[ord])
+        return [(f['name'], self.fields[ord])
                 for ord, f in sorted(self._fmap.values())]
 
     def _fieldOrd(self, key):
@@ -102,10 +102,10 @@ insert or replace into facts values (?, ?, ?, ?, ?, ?, ?, ?, ?)""",
             raise KeyError(key)
 
     def __getitem__(self, key):
-        return self._fields[self._fieldOrd(key)]
+        return self.fields[self._fieldOrd(key)]
 
     def __setitem__(self, key, value):
-        self._fields[self._fieldOrd(key)] = value
+        self.fields[self._fieldOrd(key)] = value
 
     # Tags
     ##################################################
diff --git a/tests/test_models.py b/tests/test_models.py
index b5cb4c05c..d8b551eaf 100644
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -40,19 +40,19 @@ def test_fields():
     f = m.newField()
     f['name'] = "foo"
     m.addField(f)
-    assert d.getFact(m.fids()[0])._fields == ["1", "2", ""]
+    assert d.getFact(m.fids()[0]).fields == ["1", "2", ""]
     # rename it
     m.renameField(f, "bar")
     assert d.getFact(m.fids()[0])['bar'] == ''
     # delete back
     m.delField(m.fields[1])
-    assert d.getFact(m.fids()[0])._fields == ["1", ""]
+    assert d.getFact(m.fids()[0]).fields == ["1", ""]
     # move 0 -> 1
     m.moveField(m.fields[0], 1)
-    assert d.getFact(m.fids()[0])._fields == ["", "1"]
+    assert d.getFact(m.fids()[0]).fields == ["", "1"]
     # move 1 -> 0
     m.moveField(m.fields[1], 0)
-    assert d.getFact(m.fids()[0])._fields == ["1", ""]
+    assert d.getFact(m.fids()[0]).fields == ["1", ""]
     # add another and put in middle
     f = m.newField()
     f['name'] = "baz"
@@ -60,16 +60,16 @@ def test_fields():
     f = d.getFact(m.fids()[0])
     f['baz'] = "2"
     f.flush()
-    assert d.getFact(m.fids()[0])._fields == ["1", "", "2"]
+    assert d.getFact(m.fids()[0]).fields == ["1", "", "2"]
     # move 2 -> 1
     m.moveField(m.fields[2], 1)
-    assert d.getFact(m.fids()[0])._fields == ["1", "2", ""]
+    assert d.getFact(m.fids()[0]).fields == ["1", "2", ""]
     # move 0 -> 2
     m.moveField(m.fields[0], 2)
-    assert d.getFact(m.fids()[0])._fields == ["2", "", "1"]
+    assert d.getFact(m.fids()[0]).fields == ["2", "", "1"]
     # move 0 -> 1
     m.moveField(m.fields[0], 1)
-    assert d.getFact(m.fids()[0])._fields == ["", "2", "1"]
+    assert d.getFact(m.fids()[0]).fields == ["", "2", "1"]
 
 def test_templates():
     d = getEmptyDeck()