From 2e00aaa5cf82dd41b1e81258b7d9f64ac798e68d Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Fri, 29 Jan 2010 13:15:28 +0000 Subject: [PATCH] Added month names for year/MON/day form svn: r14162 --- src/plugins/lib/libholiday.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/lib/libholiday.py b/src/plugins/lib/libholiday.py index 8f95127d8..2db9c3eba 100644 --- a/src/plugins/lib/libholiday.py +++ b/src/plugins/lib/libholiday.py @@ -297,6 +297,8 @@ class _Xml2Obj: #------------------------------------------------------------------------ class _Holidays: """ Class used to read XML holidays to add to calendar. """ + MONTHS = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', + 'jul', 'aug', 'sep', 'oct', 'nov', 'dec'] def __init__(self, elements, country="US"): self.debug = 0 self.elements = elements @@ -384,8 +386,7 @@ class _Holidays: elif mon == "*": m = date.month else: - m = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', - 'jul', 'aug', 'sep', 'oct', 'nov', 'dec'].index(mon) + 1 + m = self.MONTHS.index(mon) + 1 dates_of_dayname = self.get_daynames(y, m, dayname) if self.debug: @@ -401,6 +402,8 @@ class _Holidays: y = int(y) if m == "*": m = date.month + elif m in self.MONTHS: + m = self.MONTHS.index(m) + 1 else: m = int(m) if d == "*":