From a1cf8a387aed80196bfae5722cdbef6c18119ef6 Mon Sep 17 00:00:00 2001 From: Peter Landgren Date: Thu, 30 Sep 2010 14:33:11 +0000 Subject: [PATCH] Updates to allow for Family Tree names, with non latin characters in Windows, in -l/-L commands. svn: r15943 --- src/cli/arghandler.py | 2 +- src/cli/clidbman.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/arghandler.py b/src/cli/arghandler.py index 94dbbf04b..f7f0e291b 100644 --- a/src/cli/arghandler.py +++ b/src/cli/arghandler.py @@ -290,7 +290,7 @@ class ArgHandler(object): if self.list: print 'List of known family trees in your database path\n' for name, dirname in self.dbman.family_tree_list(): - print dirname, ', with name ', name + print dirname, ', with name ', name.encode(sys.getfilesystemencoding()) sys.exit(0) if self.list_more: diff --git a/src/cli/clidbman.py b/src/cli/clidbman.py index 2bdd50bdc..32edf56ec 100644 --- a/src/cli/clidbman.py +++ b/src/cli/clidbman.py @@ -155,7 +155,7 @@ class CLIDbManager(object): else: retval["Locked?"] = "no" retval["DB version"] = version - retval["Family tree"] = name + retval["Family tree"] = name.encode(sys.getfilesystemencoding()) retval["Path"] = dirpath retval["Last accessed"] = time.strftime('%x %X', time.localtime(tval))