More code cleanup in get_day_list() with help from Kees Bakker.

svn: r12051

src/plugins/webreport/WebCal.py

@@ -1435,29 +1435,29 @@ def get_day_list(event_date, holiday_list, bday_anniv_list):
     # initialize day_list
     day_list = []
 
+    ##################################################################
     # holiday on this day
-    if holiday_list > []:
-
-        # will force holidays to be first in the list
-        nyears = 0
-
+    # The 0 will force holidays to be first in the list
     for event_name in holiday_list:
         for line in event_name.splitlines():
-                day_list.append((nyears, event_date, line, 'Holiday'))
+            day_list.append((0, event_date, line, 'Holiday'))
+    ##################################################################
 
+    ##################################################################
     # birthday/ anniversary on this day
-    if bday_anniv_list > []:
-        birth_anniversary = [(t, e, d) for t, e, d in bday_anniv_list if d.is_valid()]
-        for text, event, date in birth_anniversary:
+    # '...' signifies an incomplete date for an event. See add_day_item()
+    bday_anniv_list = [(t, e, d) for t, e, d in bday_anniv_list
+                       if d != '...']
 
-            txt_str = None
+    # number of years have to be at least zero
+    bday_anniv_list = [(t, e, d) for t, e, d in bday_anniv_list
+                       if (event_date.get_year() - d.get_year()) >= 0]
+    for text, event, date in bday_anniv_list:
 
         # number of years married, ex: 10
         nyears = event_date.get_year() - date.get_year()
 
-            # no negative years
-            # years have to be at least zero
-            if nyears > -1:
+        txt_str = None
 
         # number of years for birthday, ex: 10 years
         age_str = event_date - date