Fixes for get_year_calendar
svn: r13743
This commit is contained in:
parent
a7d2bcc3f0
commit
f271154b59
@ -1231,15 +1231,24 @@ class Date(object):
|
|||||||
"""
|
"""
|
||||||
return self._get_low_item(Date._POS_YR)
|
return self._get_low_item(Date._POS_YR)
|
||||||
|
|
||||||
def get_year_calendar(self, calendar=None):
|
def get_year_calendar(self, calendar_name=None):
|
||||||
"""
|
"""
|
||||||
Return the year of this date in the calendar given.
|
Return the year of this date in the calendar name given.
|
||||||
|
|
||||||
Defaults to self.calendar if one is not given.
|
Defaults to self's calendar if one is not given.
|
||||||
|
|
||||||
|
>>> Date(2009, 12, 8).to_calendar("hebrew").get_year_calendar()
|
||||||
|
5770
|
||||||
"""
|
"""
|
||||||
if not calendar:
|
if calendar_name:
|
||||||
calendar = self.calendar
|
cal = self.lookup_calendar(calendar_name)
|
||||||
return self.to_calendar(calendar).get_year()
|
else:
|
||||||
|
cal = self.calendar
|
||||||
|
if cal == self.calendar:
|
||||||
|
return self.get_year()
|
||||||
|
else:
|
||||||
|
retval = Date(self)
|
||||||
|
return retval.convert_calendar(cal).get_year()
|
||||||
|
|
||||||
def get_new_year(self):
|
def get_new_year(self):
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user