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

Protection around .next() when there is no next

Browse Source 
svn: r16660
This commit is contained in:
Doug Blank 2011-02-18 01:12:34 +00:00
parent 552d11ad8e
commit 33f2d64cdd
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cli/plug/__init__.py
View File

@ -89,7 +89,10 @@ def _validate_options(options, dbase):
if not person: if not person:
person = dbase.get_default_person() person = dbase.get_default_person()
if not person: if not person:
try:
phandle = dbase.iter_person_handles().next() phandle = dbase.iter_person_handles().next()
except StopIteration:
phandle = None
person = dbase.get_person_from_handle(phandle) person = dbase.get_person_from_handle(phandle)
if not person: if not person:
print "ERROR: Please specify a person" print "ERROR: Please specify a person"
@ -108,7 +111,10 @@ def _validate_options(options, dbase):
if family_list: if family_list:
family_handle = family_list[0] family_handle = family_list[0]
else: else:
try:
family_handle = dbase.iter_family_handles().next() family_handle = dbase.iter_family_handles().next()
except StopIteration:
family_handle = None
if family_handle: if family_handle:
family = dbase.get_family_from_handle(family_handle) family = dbase.get_family_from_handle(family_handle)
option.set_value(family.get_gramps_id()) option.set_value(family.get_gramps_id())