Rename methods (PEP8)

diff --git a/coffee_getter/db.py b/coffee_getter/db.py
index d2dfdeb5d3d55a8c91dd99ae8260c0073a4f9d07..8959d78e6cdbb904693886e36c44e0db043124f6 100644 (file)
--- a/coffee_getter/db.py
+++ b/coffee_getter/db.py
@@ -70,7 +70,7 @@ class Db:
         top.sort(key=lambda x: (x[1], x[0]), reverse=True)
         return tuple(top)
 
-    def getTopMateDrinkers(self):
+    def get_top_mate_drinkers(self):
         """Return list of pairs of name, count for Mate drinkers."""
         users = {}
         que = Q("get_drinkers_of", "Club-Mate 0,5 l")
@@ -97,7 +97,7 @@ class Db:
         top.sort(key=lambda x: (x[1], x[0]), reverse=True)
         return tuple(top)
 
-    def getDrunkSum(self, *args, **kwargs):
+    def get_drunk_sum(self, *args, **kwargs):
         """Return list of drunken ``flavor`` from ``dtf`` to ``dtt``.
 
         Keyword arguments:
@@ -121,7 +121,7 @@ class Db:
             drunk.append((un, cnt))
         return tuple(drunk)
 
-    def getDrunkList(self, *args, **kwargs):
+    def get_drunk_list(self, *args, **kwargs):
         """Return dict of lists of drunken ``flavor`` from ``dtf`` to ``dtt``.
 
         Keyword arguments:

diff --git a/ut/test_db.py b/ut/test_db.py
index 36aa5b82a4e4a27e6bc9b3953a0a758f0bb27b93..40d3e5619e9753ab8610488ca21be1778e281de0 100644 (file)
--- a/ut/test_db.py
+++ b/ut/test_db.py
@@ -200,52 +200,52 @@ class DrunkSummary(TestCase):
                 ("tea", 3))
 
     def test_top_mate_drinkers(self):
-        assert self.db.getTopMateDrinkers() == (
+        assert self.db.get_top_mate_drinkers() == (
                 ("tester", 4*0.5 + 4*0.33),
                 ("clone", 0.5 + 2*0.33),
                 ("newer", 2*0.33))
-        top_sorted = list(self.db.getTopMateDrinkers())
+        top_sorted = list(self.db.get_top_mate_drinkers())
         top_sorted.sort(key=lambda x: (x[1], x[0]), reverse=True)
-        assert self.db.getTopMateDrinkers() == tuple(top_sorted)
+        assert self.db.get_top_mate_drinkers() == tuple(top_sorted)
 
     def test_top_tea_drinkers(self):
         assert self.db.get_top_tea_drinkers() == (("clone", 2), ("tester", 1))
 
     def test_coffee_sums(self):
-        s = self.db.getDrunkSum("espresso", self.lwstr, self.tdystr)
+        s = self.db.get_drunk_sum("espresso", self.lwstr, self.tdystr)
         assert s == ()
-        s = self.db.getDrunkSum("espresso lungo", self.lwstr, self.tdystr)
+        s = self.db.get_drunk_sum("espresso lungo", self.lwstr, self.tdystr)
         assert s == (("tester", 4), ("newer", 2), ("clone", 2))
 
     def test_mate_sums(self):
-        s = self.db.getDrunkSum("Club-Mate 0,33 l", self.lwstr, self.tdystr)
+        s = self.db.get_drunk_sum("Club-Mate 0,33 l", self.lwstr, self.tdystr)
         assert s == (("tester", 4), ("newer", 2), ("clone", 2))
-        s = self.db.getDrunkSum("Club-Mate 0,5 l", self.lwstr, self.tdystr)
+        s = self.db.get_drunk_sum("Club-Mate 0,5 l", self.lwstr, self.tdystr)
         assert s == (("tester", 4), ("clone", 1))
-        s = self.db.getDrunkSum(
+        s = self.db.get_drunk_sum(
                 "Club-Mate 0,5 l;Club-Mate 0,33 l",
                 self.lwstr,
                 self.tdystr)
         assert s == (("tester", 8), ("newer", 2), ("clone", 3))
-        s = self.db.getDrunkList(
+        s = self.db.get_drunk_list(
                 "Club-Mate 0,5 l;Club-Mate 0,33 l",
                 self.lwstr,
                 self.tdystr)
         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.getDrunkSum)
-        self.assertRaises(AssertionError, self.db.getDrunkSum, "")
-        self.assertRaises(AssertionError, self.db.getDrunkSum, [])
-        self.assertRaises(AssertionError, self.db.getDrunkSum, "espresso")
+        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(
                 AssertionError,
-                self.db.getDrunkSum,
+                self.db.get_drunk_sum,
                 "espresso",
                 "2010-10-20")
         self.assertRaises(
                 AssertionError,
-                self.db.getDrunkSum,
+                self.db.get_drunk_sum,
                 "espresso",
                 "lungo",
                 "2010-10-20",