forward port 2.2.x #1394 fix preemptively

svn: r9427
This commit is contained in:
James G Sack 2007-11-29 03:00:07 +00:00
parent d9e043c69b
commit aa1c1a6286
2 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2007-11-28 Jim Sack <jgsack@san.rr.com>
* src/GrampsDb/_ReadGedcom.py : remove trail whitespace (readahead)
fixes (possible) discarded reference due to bogus handles that get created
when the reference looks like "@REF_ID@ " (note space after)
This is a forward-port of the 2.2.x fix for issue #1399
2007-11-28 Douglas S. Blank <dblank@cs.brynmawr.edu> 2007-11-28 Douglas S. Blank <dblank@cs.brynmawr.edu>
* src/ReportBase/Makefile.am: removed _MenuOptions.py * src/ReportBase/Makefile.am: removed _MenuOptions.py
* src/PluginUtils/Makefile.am: added _MenuOptions.py * src/PluginUtils/Makefile.am: added _MenuOptions.py

View File

@ -360,7 +360,8 @@ class Reader:
return return
try: try:
line = line.strip('\n\r').split(None, 2) + [''] # the space ensures no trailing whitespace on last parm
line = line.strip(' \n\r').split(None, 2) + ['']
level = int(line[0]) level = int(line[0])
except: except:
continue continue