Don't crash on new-style newyear date tuple (newyear date is from trunk)

svn: r15223
2010-04-19 02:44:13 +00:00 · 2010-04-19 02:44:13 +00:00 · 41c810d9ae
commit 41c810d9ae
parent cf6a378e0a
1 changed files with 6 additions and 1 deletions
--- a/src/DateHandler/_DateDisplay.py
+++ b/src/DateHandler/_DateDisplay.py
@ -139,7 +139,12 @@ class DateDisplay(object):
        Formats the extra items (calendar, newyear) for a date.
        """
        scal = self.calendar[cal]
-        snewyear = self.newyear[newyear]
+        if isinstance(newyear, int) and newyear <= len(self.newyear):
+            snewyear = self.newyear[newyear]
+        elif isinstance(newyear, (list, tuple)):
+            snewyear = "%s-%s" % (newyear[0], newyear[1])
+        else:
+            snewyear = "Err"
        retval = ""
        for item in [scal, snewyear]:
            if item: