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

Support for non ASCII usernames in Windows.

Browse Source 
svn: r14383
This commit is contained in:
Peter Landgren 2010-02-15 11:12:09 +00:00
parent f97e6622e4
commit c0f37e1a42
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cli/clidbman.py
View File

@ -33,6 +33,7 @@ creating, and deleting of databases.
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import os import os
import sys
import time import time
from gen.ggettext import gettext as _ from gen.ggettext import gettext as _
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -384,6 +385,10 @@ def find_locker_name(dirpath):
fname = os.path.join(dirpath, "lock") fname = os.path.join(dirpath, "lock")
ifile = open(fname) ifile = open(fname)
username = ifile.read().strip() username = ifile.read().strip()
# Convert username to unicode according to system encoding
# Otherwise problems with non ASCII characters in
# username in Windows
username = unicode(username, sys.getfilesystemencoding())
last = _("Locked by %s") % username last = _("Locked by %s") % username
ifile.close() ifile.close()
except (OSError, IOError): except (OSError, IOError):