Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switched import styles on Calendar

Browse Source 
svn: r939
This commit is contained in:
Don Allingham 2002-04-21 14:47:58 +00:00
parent 2a829bd30c
commit 0c55cfd67d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gramps/src/Date.py
View File

@ -34,7 +34,7 @@ import time
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Calendar import * import Calendar
from intl import gettext from intl import gettext
_ = gettext _ = gettext
@ -948,24 +948,24 @@ class SingleDate:
day = self.day day = self.day
if self.calendar == GREGORIAN: if self.calendar == GREGORIAN:
sdn = gregorian_to_sdn(self.year,month,day) sdn = Calendar.gregorian_to_sdn(self.year,month,day)
elif self.calendar == FRENCH: elif self.calendar == FRENCH:
sdn = french_to_sdn(self.year,month,day) sdn = Calendar.french_to_sdn(self.year,month,day)
if self.calendar == HEBREW: if self.calendar == HEBREW:
sdn = jewish_to_sdn(self.year,month,day) sdn = Calendar.jewish_to_sdn(self.year,month,day)
if self.calendar == JULIAN: if self.calendar == JULIAN:
sdn = julian_to_sdn(self.year,month,day) sdn = Calendar.julian_to_sdn(self.year,month,day)
return sdn return sdn
def convert_to(self,val): def convert_to(self,val):
if val == GREGORIAN: if val == GREGORIAN:
self.convert_calendar(sdn_to_gregorian,val) self.convert_calendar(Calendar.sdn_to_gregorian,val)
elif val == JULIAN: elif val == JULIAN:
self.convert_calendar(sdn_to_julian,val) self.convert_calendar(Calendar.sdn_to_julian,val)
elif val == HEBREW: elif val == HEBREW:
self.convert_calendar(sdn_to_jewish,val) self.convert_calendar(Calendar.sdn_to_jewish,val)
else: else:
self.convert_calendar(sdn_to_french,val) self.convert_calendar(Calendar.sdn_to_french,val)
def convert_calendar(self,func,mode): def convert_calendar(self,func,mode):
sdn = self.get_sdn() sdn = self.get_sdn()