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

Issue 4515, allow only 09, 0A, 0D in GEDCOM input.

Browse Source 
svn: r16341
This commit is contained in:
Peter Landgren 2011-01-05 18:12:15 +00:00
parent b94008e412
commit 76e66f6104
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/lib/libgedcom.py
View File

@ -531,6 +531,9 @@ lds_status = {
"UNCLEARED": gen.lib.LdsOrd.STATUS_UNCLEARED, "UNCLEARED": gen.lib.LdsOrd.STATUS_UNCLEARED,
} }
# table for skipping illegal control chars in GEDCOM import
# Only 09, 0A, 0D are allowed.
strip_dict = dict.fromkeys(range(9)+range(11,13)+range(14, 32))
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -1164,9 +1167,10 @@ class BaseReader(object):
self.ifile.seek(0) self.ifile.seek(0)
def readline(self): def readline(self):
return unicode(self.ifile.readline(), line = unicode(self.ifile.readline(),
encoding=self.enc, encoding=self.enc,
errors='replace') errors='replace')
return line.strip().translate(strip_dict)
class UTF8Reader(BaseReader): class UTF8Reader(BaseReader):
@ -1181,9 +1185,10 @@ class UTF8Reader(BaseReader):
self.ifile.seek(0) self.ifile.seek(0)
def readline(self): def readline(self):
return unicode(self.ifile.readline(), line = unicode(self.ifile.readline(),
encoding=self.enc, encoding=self.enc,
errors='replace') errors='replace')
return line.strip().translate(strip_dict)
class UTF16Reader(BaseReader): class UTF16Reader(BaseReader):