From 11f3de525ff34f45f51cdea54db9ca6b6fed5643 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Tue, 29 Mar 2011 18:29:20 +0900
Subject: [PATCH] groupConf() takes gcid, not gid

---
 anki/deck.py       | 11 +++++------
 tests/test_deck.py |  3 ---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/anki/deck.py b/anki/deck.py
index ad07e542b..a4f4c6434 100644
--- a/anki/deck.py
+++ b/anki/deck.py
@@ -568,12 +568,6 @@ update facts set tags = :t, mod = :n where id = :id""", [fix(row) for row in res
     def delGroup(self, gid):
         self.db.scalar("delete from groups where id = ?", gid)
 
-    def groupConf(self, gid):
-        return simplejson.loads(
-            self.db.scalar("""
-select conf from gconf where id = (select gcid from groups where id = ?)""",
-                           gid))
-
     def setGroup(self, cids, gid):
         self.db.execute(
             "update cards set gid = ? where id in "+ids2str(cids), gid)
@@ -585,6 +579,11 @@ select conf from gconf where id = (select gcid from groups where id = ?)""",
         "Return [name, id]."
         return self.db.all("select name, id from gconf order by name")
 
+    def groupConf(self, gcid):
+        return simplejson.loads(
+            self.db.scalar(
+                "select conf from gconf where id = ?", gcid))
+
     # Tag-based selective study
     ##########################################################################
 
diff --git a/tests/test_deck.py b/tests/test_deck.py
index 4a5b19ee5..68e204d7f 100644
--- a/tests/test_deck.py
+++ b/tests/test_deck.py
@@ -144,9 +144,6 @@ def test_groups():
     deck.delGroup(2)
     assert len(deck.groups()) == 1
     assert deck.groupId("another group") == 3
-    # the newly created group should have a default schedule
-    conf = deck.groupConf(3)
-    assert conf == deck.groupConf(1)
     # by default, everything should be shown
     assert not deck.qconf['groups']