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

2007-02-26 Don Allingham <don@gramps-project.org>

Browse Source 
* src/GrampsDbUtils/_GedcomParse.py: encode file name properly



svn: r8245
This commit is contained in:
Don Allingham 2007-02-26 16:42:42 +00:00
parent 551a36536e
commit 27b4846869
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2007-02-26 Don Allingham <don@gramps-project.org>
* src/GrampsDbUtils/_GedcomParse.py: encode file name properly
2007-02-26 Zsolt Foldvari <zfoldvar@users.sourceforge.net> 2007-02-26 Zsolt Foldvari <zfoldvar@users.sourceforge.net>
* src/MarkupText.py: avoid creating empty elements in xml generator * src/MarkupText.py: avoid creating empty elements in xml generator

13
src/GrampsDbUtils/_GedcomParse.py
View File

@ -90,6 +90,7 @@ __author__ = "Don Allingham"
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import os import os
import sys
import re import re
import time import time
from gettext import gettext as _ from gettext import gettext as _
@ -329,9 +330,7 @@ class GedcomParser(UpdateCallback):
self.def_src = RelLib.Source() self.def_src = RelLib.Source()
fname = os.path.basename(filename).split('\\')[-1] fname = os.path.basename(filename).split('\\')[-1]
self.def_src.set_title(_("Import from GEDCOM (%s)") % self.def_src.set_title(_("Import from GEDCOM (%s)") %
unicode(fname, encode_filename(fname))
encoding=sys.getfilesystemencoding(),
errors='replace'))
self.dir_path = os.path.dirname(filename) self.dir_path = os.path.dirname(filename)
self.is_ftw = False self.is_ftw = False
self.is_ancestry_com = False self.is_ancestry_com = False
@ -1028,7 +1027,6 @@ class GedcomParser(UpdateCallback):
msg = _("Line %d was not understood, so it was ignored.") % text msg = _("Line %d was not understood, so it was ignored.") % text
self.warn(msg) self.warn(msg)
self.error_count += 1 self.error_count += 1
import sys
sys.exit(1) sys.exit(1)
self.skip_subordinate_levels(level) self.skip_subordinate_levels(level)
@ -4349,3 +4347,10 @@ def family_event_name(event, family):
} }
event.set_description(text) event.set_description(text)
def encode_filename(name):
enc = sys.getfilesystemencoding()
if enc == "UTF-8":
return name
else:
return unicode(name, encoding=enc, errors='replace')