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:
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:
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)
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:
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:
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
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"])
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",