remove expanduser

svn: r6220
This commit is contained in:
Don Allingham 2006-03-29 04:46:26 +00:00
parent 4c3e96b163
commit 0872a0d830
2 changed files with 4 additions and 5 deletions

View File

@ -337,9 +337,8 @@ class ArgHandler:
#self.parent.cl = bool(self.exports or self.actions or self.parent.cl) #self.parent.cl = bool(self.exports or self.actions or self.parent.cl)
# Create dir for imported database(s) # Create dir for imported database(s)
self.impdir_path = os.path.expanduser("~/.gramps/import" ) self.impdir_path = os.path.join(const.home_dir,"import" )
self.imp_db_path = os.path.expanduser( self.imp_db_path = os.path.join(self.impdir_path, "import_db.grdb" )
"~/.gramps/import/import_db.grdb" )
if not os.path.isdir(self.impdir_path): if not os.path.isdir(self.impdir_path):
try: try:
os.mkdir(self.impdir_path,0700) os.mkdir(self.impdir_path,0700)
@ -437,7 +436,7 @@ class ArgHandler:
os._exit(1) os._exit(1)
elif format == 'gramps-pkg': elif format == 'gramps-pkg':
# Create tempdir, if it does not exist, then check for writability # Create tempdir, if it does not exist, then check for writability
tmpdir_path = os.path.expanduser("~/.gramps/tmp" ) tmpdir_path = os.path.join(const.home_dir,"tmp")
if not os.path.isdir(tmpdir_path): if not os.path.isdir(tmpdir_path):
try: try:
os.mkdir(tmpdir_path,0700) os.mkdir(tmpdir_path,0700)

View File

@ -798,7 +798,7 @@ class StyleSheetList:
""" """
defstyle.set_name('default') defstyle.set_name('default')
self.map = { "default" : defstyle } self.map = { "default" : defstyle }
self.file = os.path.expanduser("~/.gramps/" + file) self.file = os.path.join(const.home_dir,file)
self.parse() self.parse()
def delete_style_sheet(self,name): def delete_style_sheet(self,name):