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

GEPS008: Create new module for file utilities

Browse Source 
svn: r19906
This commit is contained in:
Nick Hall
2012-06-23 22:13:23 +00:00
parent 3ec4c0f80c
commit 2a0b009bdf
51 changed files with 424 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/cli/arghandler.py
View File

@@ -46,7 +46,8 @@ from gen.ggettext import gettext as _
#
#-------------------------------------------------------------------------
from gen.recentfiles import recent_files
import Utils
from gen.utils.file import (rm_tempdir, get_empty_tempdir,
get_unicode_path_from_env_var)
import gen
from clidbman import CLIDbManager, NAME_FILE, find_locker_name
@@ -207,7 +208,7 @@ class ArgHandler(object):
"""
if value is None:
return None
value = Utils.get_unicode_path_from_env_var(value)
value = get_unicode_path_from_env_var(value)
db_path = self.__deduce_db_path(value)
if db_path:
@@ -237,7 +238,7 @@ class ArgHandler(object):
"""
# Need to convert path/filename to unicode before opening
# For non latin characters in Windows path/file/user names
value = Utils.get_unicode_path_from_env_var(value)
value = get_unicode_path_from_env_var(value)
fname = value
fullpath = os.path.abspath(os.path.expanduser(fname))
if fname != '-' and not os.path.exists(fullpath):
@@ -274,7 +275,7 @@ class ArgHandler(object):
return
# Need to convert path/filename to unicode before opening
# For non latin characters in Windows path/file/user names
value = Utils.get_unicode_path_from_env_var(value)
value = get_unicode_path_from_env_var(value)
fname = value
if fname == '-':
fullpath = '-'
@@ -450,7 +451,7 @@ class ArgHandler(object):
# remove files in import db subdir after use
self.dbstate.db.close()
if self.imp_db_path:
Utils.rm_tempdir(self.imp_db_path)
rm_tempdir(self.imp_db_path)
def __import_action(self):
"""
@@ -469,7 +470,7 @@ class ArgHandler(object):
if self.gui:
self.imp_db_path, title = self.dbman.create_new_db_cli()
else:
self.imp_db_path = Utils.get_empty_tempdir("import_dbdir") \
self.imp_db_path = get_empty_tempdir("import_dbdir") \
.encode(sys.getfilesystemencoding())
newdb = gen.db.DbBsddb()
newdb.write_version(self.imp_db_path)

6
src/cli/argparser.py
View File

@@ -49,7 +49,7 @@ import logging
import const
from gen.config import config
from gen.utils.configmanager import safe_eval
import Utils
from gen.utils.file import get_unicode_path_from_env_var
# Note: Make sure to edit const.py.in POPT_TABLE too!
_HELP = _("""
@@ -216,7 +216,7 @@ class ArgParser(object):
# -Ärik is '-\xc3\x84rik' and getopt will respond :
# option -\xc3 not recognized
for arg in range(len(self.args) - 1):
self.args[arg+1] = Utils.get_unicode_path_from_env_var(self.args[arg + 1])
self.args[arg+1] = get_unicode_path_from_env_var(self.args[arg + 1])
options, leftargs = getopt.getopt(self.args[1:],
const.SHORTOPTS, const.LONGOPTS)
except getopt.GetoptError, msg:
@@ -350,7 +350,7 @@ class ArgParser(object):
# but not for non-latin characters in list elements
cliargs = "[ "
for arg in range(len(self.args) - 1):
cliargs += Utils.get_unicode_path_from_env_var(self.args[arg + 1]) + " "
cliargs += get_unicode_path_from_env_var(self.args[arg + 1]) + " "
cliargs += "]"
self.errors += [(_('Error parsing the arguments'),
_("Error parsing the arguments: %s \n"