[billreminder] Renamed get_schedule_timestamp to get_schedule_date and changed it to return datetime.date objects.

[Og B. Maciel <ogmaciel src gnome org>]

commit cde25cf5cb179836149540832228b7b32b833bf0
Author: Og B. Maciel <ogmaciel gnome org>
Date:   Fri Oct 2 20:42:15 2009 -0400

    Renamed get_schedule_timestamp to get_schedule_date and changed it to return datetime.date objects.

 src/gui/adddialog.py |    2 +-
 src/lib/scheduler.py |   22 ++++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/src/gui/adddialog.py b/src/gui/adddialog.py
index 2a1d0e6..c83f1eb 100644
--- a/src/gui/adddialog.py
+++ b/src/gui/adddialog.py
@@ -426,7 +426,7 @@ class AddDialog(gtk.Dialog):
             # Verify how many bills will be inserted
             # this will only work for new bills
             records = []
-            days = scheduler.get_schedule_timestamp(
+            days = scheduler.get_schedule_date(
                 frequency, selectedDate, endDate)
 
             for day in days:
diff --git a/src/lib/scheduler.py b/src/lib/scheduler.py
index 493feb3..d281f80 100644
--- a/src/lib/scheduler.py
+++ b/src/lib/scheduler.py
@@ -43,7 +43,7 @@ def datetime_from_timestamp(timestamp):
 
     return ret
 
-def get_schedule_timestamp(frequency, startDate, endDate=None):
+def get_schedule_date(frequency, startDate, endDate=None):
     ''' Returns a list of scheduled date from original date. '''
 
     # Takes care of endDates in the past
@@ -57,14 +57,12 @@ def get_schedule_timestamp(frequency, startDate, endDate=None):
     days = []
 
     for i in range(multiplier):
-        # Convert to timestamps
-        dtstamp = timestamp_from_datetime(startDate)
-        days.append(dtstamp)
+        days.append(startDate)
 
         if frequency == SC_MONTHLY:
             nextMonth = startDate.month % 12 + 1
             nextMonthYear = startDate.year + ((startDate.month) / 12)
-            startDate = datetime.datetime(nextMonthYear, nextMonth, startDate.day)
+            startDate = datetime.date(nextMonthYear, nextMonth, startDate.day)
         else:
             delta = datetime.timedelta(days=MULTIPLIER[frequency])
             startDate = startDate + delta
@@ -118,38 +116,38 @@ if __name__ == "__main__":
 
     # Tests for non-repeatable tasks
     print "Repeat once, starting today, ending yesterday"
-    repeats = get_schedule_timestamp(SC_ONCE, today, yesterday)
+    repeats = get_schedule_date(SC_ONCE, today, yesterday)
     assert len(repeats) == 1, "Should have gotten one result back! Got %s" % len(repeats)
     assert repeats[0] == timestamp_from_datetime(today), "The date is wrong"
 
     print "Repeat once, starting today, ending nextweek"
-    repeats = get_schedule_timestamp(SC_ONCE, today, nextweek)
+    repeats = get_schedule_date(SC_ONCE, today, nextweek)
     assert len(repeats) == 1, "Should have gotten one result back! Got %s" % len(repeats)
     assert repeats[0] == timestamp_from_datetime(today), "The date is wrong"
 
     print "Repeat once, starting yesterday, ending today"
-    repeats = get_schedule_timestamp(SC_ONCE, yesterday, today)
+    repeats = get_schedule_date(SC_ONCE, yesterday, today)
     assert len(repeats) == 1, "Should have gotten one result back! Got %s" % len(repeats)
     assert repeats[0] == timestamp_from_datetime(yesterday), "The date is wrong"
 
     print "Repeat once, starting nextyear, ending today"
-    repeats = get_schedule_timestamp(SC_ONCE, nextyear, today)
+    repeats = get_schedule_date(SC_ONCE, nextyear, today)
     assert len(repeats) == 1, "Should have gotten one result back! Got %s" % len(repeats)
     assert repeats[0] == timestamp_from_datetime(nextyear), "The date is wrong"
 
     # Tests for weekly tasks
     print "Repeat weekly, starting today, ending yesterday"
-    repeats = get_schedule_timestamp(SC_WEEKLY, today, yesterday)
+    repeats = get_schedule_date(SC_WEEKLY, today, yesterday)
     assert len(repeats) == 1, "Should have gotten one result back! Got %s" % len(repeats)
     assert repeats[0] == timestamp_from_datetime(today), "The date is wrong"
 
     print "Repeat weekly, starting today, ending 9 days ahead"
-    repeats = get_schedule_timestamp(SC_WEEKLY, today, ninedaysahead)
+    repeats = get_schedule_date(SC_WEEKLY, today, ninedaysahead)
     assert len(repeats) == 2, "Should have gotten 2 result back! Got %s" % len(repeats)
     assert repeats[0] == timestamp_from_datetime(today), "The date is wrong"
 
     print "Repeat weekly, starting today, ending 3 weeks ahead"
-    repeats = get_schedule_timestamp(SC_WEEKLY, today, next3weeks)
+    repeats = get_schedule_date(SC_WEEKLY, today, next3weeks)
     assert len(repeats) == 4, "Should have gotten four result back! Got %s" % len(repeats)
     assert repeats[0] == timestamp_from_datetime(today), "The date is wrong"