remove expanduser

svn: r6218
This commit is contained in:
Don Allingham
2006-03-29 04:11:17 +00:00
parent ae90bbe812
commit dcec2c11c9
6 changed files with 21 additions and 11 deletions

View File

@@ -159,7 +159,7 @@ class Calendar(Report.Report):
def get_holidays(self, year, country = "US"):
""" Looks in multiple places for holidays.xml files """
locations = [const.pluginsDir,
os.path.expanduser("~/.gramps/plugins")]
os.path.join(const.home_dir,"plugins")]
holiday_file = 'holidays.xml'
for dir in locations:
holiday_full_path = os.path.join(dir, holiday_file)

View File

@@ -923,7 +923,7 @@ class GraphVizGraphics(Report.Report):
self.doc = options_class.get_document()
self.user_output = options_class.get_output()
self.junk_output = os.path.expanduser("~/.gramps/junk")
self.junk_output = os.path.join(const.home_dir,"junk")
self.the_format = self.options_class.handler.options_dict['gvof']
self.the_font = self.options_class.handler.options_dict['font']