change(datetimes): allow date to be passed not as a callable

Author: iarp

iarp_utils/datetimes.py

@@ -55,7 +55,7 @@ def iterate_steps_between_datetimes(start, end, steps):
         start += steps
 
 
-def get_current_week_of(weekday_number, date=datetime.datetime.today):
+def get_current_week_of(weekday_number, date=None):
     """ Returns the last date of the weekday_number supplied.
 
     i.e. I always need Thursdays but if today isn't Thursday,
@@ -74,7 +74,9 @@ def get_current_week_of(weekday_number, date=datetime.datetime.today):
         date object
 
     """
-    today = date()
+    today = date
+    if not date:
+        today = datetime.datetime.today()
 
     offset = (today.weekday() - weekday_number) % 7
 

tests/test_datetimes.py

@@ -27,6 +27,7 @@ def test_short_day_name(self):
         self.assertEqual(5, weekday('fri'))
         self.assertEqual(6, weekday('sat'))
 
+
 class DatetimeLoopIteratorTests(unittest.TestCase):
     def test_iterator_five_minutes(self):
 
@@ -66,6 +67,7 @@ def test_iterator_ten_minutes(self):
 
         self.assertEqual([], expected)
 
+
 class CurrentWeekOfTests(unittest.TestCase):
 
     def test_current_week_of_general_value(self):
@@ -79,3 +81,14 @@ def test_current_week_of_general_value(self):
             self.assertEqual(datetime.date(2001, 1, 12), get_current_week_of(calendar.FRIDAY))
             self.assertEqual(datetime.date(2001, 1, 13), get_current_week_of(calendar.SATURDAY))
             self.assertEqual(datetime.date(2001, 1, 14), get_current_week_of(calendar.SUNDAY))
+
+    def test_current_week_of_general_value_as_passed_param(self):
+        date = datetime.date(2001, 1, 18)
+
+        self.assertEqual(datetime.date(2001, 1, 15), get_current_week_of(calendar.MONDAY, date=date))
+        self.assertEqual(datetime.date(2001, 1, 16), get_current_week_of(calendar.TUESDAY, date=date))
+        self.assertEqual(datetime.date(2001, 1, 17), get_current_week_of(calendar.WEDNESDAY, date=date))
+        self.assertEqual(datetime.date(2001, 1, 18), get_current_week_of(calendar.THURSDAY, date=date))
+        self.assertEqual(datetime.date(2001, 1, 12), get_current_week_of(calendar.FRIDAY, date=date))
+        self.assertEqual(datetime.date(2001, 1, 13), get_current_week_of(calendar.SATURDAY, date=date))
+        self.assertEqual(datetime.date(2001, 1, 14), get_current_week_of(calendar.SUNDAY, date=date))