Fix number of arguments in _sum/_list functions

diff --git a/coffee_getter/bot.py b/coffee_getter/bot.py
index 346aeae5726b61c3ba3a3ab62cc921bd2fad3373..4aed9b0057820cdd7fe0cb8e007bf4e1557135f7 100644 (file)
--- a/coffee_getter/bot.py
+++ b/coffee_getter/bot.py
@@ -199,7 +199,7 @@ class Bot:
             self.get_some_smile()
         )
 
-    def load_drunk_sum(self, *args, **kwargs):
+    def load_drunk_sum(self, flavor, dtf, dtt):
         """Get list of drunken ``flavor`` from ``dtf`` to ``dtt``, update msg.
 
         Keyword arguments:
@@ -207,22 +207,14 @@ class Bot:
         dtf -- Date and time *from*.
         dtt -- Date and time *to*.
         """
-        self.top = self.db.get_drunk_sum(*args, **kwargs)
-        if args:
-            flavor = args[0]
-            dtf = args[1]
-            dtt = args[2]
-        elif kwargs:
-            flavor = kwargs["flavor"]
-            dtf = kwargs["dtf"]
-            dtt = kwargs["dtt"]
+        self.top = self.db.get_drunk_sum(flavor, dtf, dtt)
         self.msg = "{} drunk from {} to {}:\n".format(flavor, dtf, dtt)
         for (un, cnt) in self.top:
             self.msg += "{}: {}\n".format(un, cnt)
         self.msg += "---"
         return
 
-    def load_drunk_list(self, *args, **kwargs):
+    def load_drunk_list(self, flavor, dtf, dtt):
         """Get list of drunken ``flavor`` from ``dtf`` to ``dtt``, update msg.
 
         Keyword arguments:
@@ -230,16 +222,8 @@ class Bot:
         dtf -- Date and time *from*.
         dtt -- Date and time *to*.
         """
-        self.top = self.db.get_drunk_sum(*args, **kwargs)
-        d = self.db.get_drunk_list(*args, **kwargs)
-        if args:
-            flavor = args[0]
-            dtf = args[1]
-            dtt = args[2]
-        elif kwargs:
-            flavor = kwargs["flavor"]
-            dtf = kwargs["dtf"]
-            dtt = kwargs["dtt"]
+        self.top = self.db.get_drunk_sum(flavor, dtf, dtt)
+        d = self.db.get_drunk_list(flavor, dtf, dtt)
         self.msg = "{} drunk from {} to {}:\n".format(flavor, dtf, dtt)
         for (un, l) in d.items():
             self.msg += "{}: ".format(un)

diff --git a/coffee_getter/db.py b/coffee_getter/db.py
index 8959d78e6cdbb904693886e36c44e0db043124f6..f1803ef228c5949451b7f24db28348559d977255 100644 (file)
--- a/coffee_getter/db.py
+++ b/coffee_getter/db.py
@@ -97,7 +97,7 @@ class Db:
         top.sort(key=lambda x: (x[1], x[0]), reverse=True)
         return tuple(top)
 
-    def get_drunk_sum(self, *args, **kwargs):
+    def get_drunk_sum(self, flavor, dtf, dtt):
         """Return list of drunken ``flavor`` from ``dtf`` to ``dtt``.
 
         Keyword arguments:
@@ -105,23 +105,13 @@ class Db:
         dtf -- Date and time *from*.
         dtt -- Date and time *to*.
         """
-        assert ((len(args) == 3 and len(kwargs) == 0)
-                or (len(args) == 0 and len(kwargs) == 3))
-        if args:
-            flavor = args[0]
-            dtf = args[1]
-            dtt = args[2]
-        elif kwargs:
-            flavor = kwargs["flavor"]
-            dtf = kwargs["dtf"]
-            dtt = kwargs["dtt"]
         que = Q("get_drinkers_of", flavor.split(";"), (dtf, dtt))
         drunk = []
         for (cnt, un) in self.cur.execute(que):
             drunk.append((un, cnt))
         return tuple(drunk)
 
-    def get_drunk_list(self, *args, **kwargs):
+    def get_drunk_list(self, flavor, dtf, dtt):
         """Return dict of lists of drunken ``flavor`` from ``dtf`` to ``dtt``.
 
         Keyword arguments:
@@ -129,16 +119,6 @@ class Db:
         dtf -- Date and time *from*.
         dtt -- Date and time *to*.
         """
-        assert ((len(args) == 3 and len(kwargs) == 0)
-                or (len(args) == 0 and len(kwargs) == 3))
-        if args:
-            flavor = args[0]
-            dtf = args[1]
-            dtt = args[2]
-        elif kwargs:
-            flavor = kwargs["flavor"]
-            dtf = kwargs["dtf"]
-            dtt = kwargs["dtt"]
         flavors = flavor.split(";")
         drunk = {}
         i = 0

diff --git a/ut/test_bot.py b/ut/test_bot.py
index e86613a024dde71b4717d2238ddb75b2bd1b09ae..7193c02c330dc932457791c93ef13594b5ca2956 100644 (file)
--- a/ut/test_bot.py
+++ b/ut/test_bot.py
@@ -74,23 +74,23 @@ class CoffeeGetterBotTests(TestCase):
         assert len(self.b.topeq) == 2
 
     def test_nof_args(self):
-        self.assertRaises(AssertionError, self.b.load_drunk_sum)
-        self.assertRaises(AssertionError, self.b.load_drunk_sum, ["espresso"])
+        self.assertRaises(TypeError, self.b.load_drunk_sum)
+        self.assertRaises(TypeError, self.b.load_drunk_sum, ["espresso"])
         self.assertRaises(
-            AssertionError,
+            TypeError,
             self.b.load_drunk_sum,
             ["espresso", "2010-10-20"])
         self.assertRaises(
-            AssertionError,
+            TypeError,
             self.b.load_drunk_sum,
             ["espresso", "lungo", "2010-10-20", "2020-10-20"])
-        self.assertRaises(AssertionError, self.b.load_drunk_list)
-        self.assertRaises(AssertionError, self.b.load_drunk_list, ["espresso"])
+        self.assertRaises(TypeError, self.b.load_drunk_list)
+        self.assertRaises(TypeError, self.b.load_drunk_list, ["espresso"])
         self.assertRaises(
-            AssertionError,
+            TypeError,
             self.b.load_drunk_list,
             ["espresso", "2010-10-20"])
         self.assertRaises(
-            AssertionError,
+            TypeError,
             self.b.load_drunk_list,
             ["espresso", "lungo", "2010-10-20", "2020-10-20"])

diff --git a/ut/test_db.py b/ut/test_db.py
index 40d3e5619e9753ab8610488ca21be1778e281de0..4320f56ba70a2918a656dc0001ec7b1f50f3de3a 100644 (file)
--- a/ut/test_db.py
+++ b/ut/test_db.py
@@ -234,17 +234,17 @@ class DrunkSummary(TestCase):
         assert s == {"tester": [4, 4], "newer": [0, 2], "clone": [1, 2]}
 
     def test_assert_error_raised_for_bad_number_of_arguments(self):
-        self.assertRaises(AssertionError, self.db.get_drunk_sum)
-        self.assertRaises(AssertionError, self.db.get_drunk_sum, "")
-        self.assertRaises(AssertionError, self.db.get_drunk_sum, [])
-        self.assertRaises(AssertionError, self.db.get_drunk_sum, "espresso")
+        self.assertRaises(TypeError, self.db.get_drunk_sum)
+        self.assertRaises(TypeError, self.db.get_drunk_sum, "")
+        self.assertRaises(TypeError, self.db.get_drunk_sum, [])
+        self.assertRaises(TypeError, self.db.get_drunk_sum, "espresso")
         self.assertRaises(
-                AssertionError,
+                TypeError,
                 self.db.get_drunk_sum,
                 "espresso",
                 "2010-10-20")
         self.assertRaises(
-                AssertionError,
+                TypeError,
                 self.db.get_drunk_sum,
                 "espresso",
                 "lungo",