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

2006-05-16 Don Allingham <don@gramps-project.org>

Browse Source 
* src/GrampsDb/_ReadGedcom.py: handle blank lines



svn: r6684
This commit is contained in:
Don Allingham 2006-05-17 01:23:14 +00:00
parent 3b6d63e48f
commit 5bfd79c6a3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2006-05-16 Don Allingham <don@gramps-project.org>
* src/GrampsDb/_ReadGedcom.py: handle blank lines
2006-05-16 Alex Roitman <shura@gramps-project.org> 2006-05-16 Alex Roitman <shura@gramps-project.org>
* src/Selectors/_SelectPerson.py: Use new package. * src/Selectors/_SelectPerson.py: Use new package.
* src/plugins/RelCalc.py: Use new package. * src/plugins/RelCalc.py: Use new package.

8
src/GrampsDb/_ReadGedcom.py
View File

@ -449,9 +449,11 @@ class Reader:
def readahead(self): def readahead(self):
while len(self.current_list) < 5: while len(self.current_list) < 5:
line = self.f.readline() old_line = self.f.readline()
self.index += 1 self.index += 1
line = line.strip('\r\n') line = old_line.strip('\r\n')
if line == "" and line != old_line:
continue
if line == "": if line == "":
self.f.close() self.f.close()
self.eof = True self.eof = True
@ -1091,7 +1093,7 @@ class GedcomParser(UpdateCallback):
mrel = _TYPE_BIRTH mrel = _TYPE_BIRTH
frel = _TYPE_BIRTH frel = _TYPE_BIRTH
# Legacy _PREF # Legacy _PREF
elif matches[1][0] == TOKEN_UNKNOWN: elif matches[1] and matches[1][0] == TOKEN_UNKNOWN:
pass pass
else: else:
self.barf(level+1) self.barf(level+1)