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

add USER_xxx constants to const, use them

Browse Source 
svn: r9407
This commit is contained in:
James G Sack
2007-11-26 05:11:19 +00:00
parent 88f23700a0
commit ecfa4aa0c0
7 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/Calendar.py
View File

@ -182,8 +182,7 @@ class Calendar(Report):
def get_holidays(self, year, country = "United States"):
""" Looks in multiple places for holidays.xml files """
locations = [const.PLUGINS_DIR,
os.path.join(const.HOME_DIR,"plugins")]
locations = [const.PLUGINS_DIR, const.USER_PLUGINS]
holiday_file = 'holidays.xml'
for dir in locations:
holiday_full_path = os.path.join(dir, holiday_file)
@ -834,8 +833,7 @@ class Holidays:
def get_countries():
""" Looks in multiple places for holidays.xml files """
locations = [const.PLUGINS_DIR,
os.path.join(const.HOME_DIR,"plugins")]
locations = [const.PLUGINS_DIR, const.USER_PLUGINS]
holiday_file = 'holidays.xml'
country_list = []
for dir in locations: