From 0e26998664739ccdd4b81d031f0154b57474477c Mon Sep 17 00:00:00 2001
From: "Rob G. Healey" <robhealey1@gmail.com>
Date: Thu, 19 Feb 2009 17:43:53 +0000
Subject: [PATCH] Fixed USA holidays problem.  There was no holidays being
 listed.

svn: r12040
---
 src/plugins/lib/holidays.xml    |  2 +
 src/plugins/webreport/WebCal.py | 65 ++++++++++++++++-----------------
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/src/plugins/lib/holidays.xml b/src/plugins/lib/holidays.xml
index ee62f403d..7d8508581 100644
--- a/src/plugins/lib/holidays.xml
+++ b/src/plugins/lib/holidays.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <calendar>
+  <country name="">
+  </country>  
   <country name="United States">
     <date name="New Year's Eve" value="*/12/31" type="national" />
     <date name="New Year's Day" value="*/1/1" type="national" />
diff --git a/src/plugins/webreport/WebCal.py b/src/plugins/webreport/WebCal.py
index 34c9e6fb7..fc1d4faea 100644
--- a/src/plugins/webreport/WebCal.py
+++ b/src/plugins/webreport/WebCal.py
@@ -426,8 +426,7 @@ class WebCalReport(Report):
         num_years = (self.end_year - self.start_year)
         cal_year = self.start_year
 
-        nrows = (num_years / 16)
-        for rows in range(0, (nrows + 1)):
+        for rows in range((num_years // 16) + 1):
             of.write('<div id="navigation">\n')
             of.write('\t<ul>\n')
             cols = 0
@@ -1447,49 +1446,47 @@ def get_day_list(event_date, holiday_list, bday_anniv_list):
 
     # birthday/ anniversary on this day
     if bday_anniv_list > []:
-        for text, event, date in 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()
             txt_str = None
-            if date != '...':
 
-                # number of years married, ex: 10
-                nyears = event_date.get_year() - date.get_year()
+            # 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:
+            # no negative years; have to be at least zero
+            if nyears > -1:
 
-                    # number of years for birthday, ex: 10 years
-                    age_str = event_date - date
-                    age_str.format(precision=1)
+                # number of years for birthday, ex: 10 years
+                age_str = event_date - date
+                age_str.format(precision=1)
 
-                    # a birthday
-                    if event == 'Birthday':
+                # a birthday
+                if event == 'Birthday':
 
-                        if nyears == 0:
-                            txt_str = _('%(person)s, <em>birth</em>') % {
-                                        'person' : text}
-                        else: 
-                            txt_str = _('%(person)s, <em>%(age)s</em> old') % {
-                                        'person' : text, 'age' : age_str}
+                    if nyears == 0:
+                        txt_str = _('%(person)s, <em>birth</em>') % {
+                                    'person' : text}
+                    else: 
+                        txt_str = _('%(person)s, <em>%(age)s</em> old') % {
+                                    'person' : text, 'age' : age_str}
 
-                    # an anniversary
-                    elif event == 'Anniversary':
+                # an anniversary
+                elif event == 'Anniversary':
 
-                        if nyears == 0:
-                            txt_str = _('%(couple)s, <em>wedding</em>') % {
+                    if nyears == 0:
+                        txt_str = _('%(couple)s, <em>wedding</em>') % {
                                     'couple' : text}
-                        else: 
-                            txt_str = (ngettext('%(couple)s, <em>%(years)d'
-                                                '</em> year anniversary',
-                                                '%(couple)s, <em>%(years)d'
-                                                '</em> year anniversary', nyears)
-                                       % {'couple' : text, 'years'  : nyears})
-                        txt_str = '<span class="yearsmarried">%s</span>' % txt_str
+                    else: 
+                        txt_str = (ngettext('%(couple)s, <em>%(years)d'
+                                            '</em> year anniversary',
+                                            '%(couple)s, <em>%(years)d'
+                                            '</em> year anniversary', nyears)
+                                   % {'couple' : text, 'years'  : nyears})
+                    txt_str = '<span class="yearsmarried">%s</span>' % txt_str
 
-                if txt_str is not None:
-                    day_list.append((nyears, date, txt_str, event))
+            if txt_str is not None:
+                day_list.append((nyears, date, txt_str, event))
 
     # sort them based on number of years
     # holidays will always be on top of day