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

* src/ChooseParents.py: pychecker changes

Browse Source 
* src/DdTargets.py: pychecker changes
* src/FamilyView.py: pychecker changes
* src/GrampsCfg.py: pychecker changes
* src/MergeData.py: pychecker changes
* src/MergePeople.py: pychecker changes
* src/NameEdit.py: pychecker changes
* src/NoteEdit.py: pychecker changes
* src/RelLib.py: pychecker changes
* src/gramps_main.py: pychecker changes


svn: r4327
This commit is contained in:
Don Allingham
2005-04-09 03:11:03 +00:00
parent f70a65446a
commit c987a9faff
12 changed files with 34 additions and 1307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/MergePeople.py
View File

@ -35,7 +35,6 @@ from gettext import gettext as _
import RelLib
import ReportUtils
import Utils
import ListModel
import NameDisplay
import const
import gtk
@ -117,8 +116,8 @@ class Compare:
if len(plist) > 0:
self.add(tobj,title,_("Parents"))
for fid in person.get_parent_family_handle_list():
(fn,mn,id) = self.get_parent_info(fid[0])
self.add(tobj,normal,"%s:\t%s" % (_('Family ID'),id))
(fn,mn,gid) = self.get_parent_info(fid[0])
self.add(tobj,normal,"%s:\t%s" % (_('Family ID'),gid))
if fn:
self.add(tobj,indent,"%s:\t%s" % (_('Father'),fn))
if mn:
@ -421,7 +420,7 @@ class MergePeople:
src_family = self.db.get_family_from_handle(src_family_handle)
family_num += 1
if not src_family or src_family in self.p1.get_family_handle_list():
if not src_family or src_family in family_list:
continue
tgt_family = self.find_family(src_family)
@ -538,7 +537,7 @@ class MergePeople:
if self.p2 == fam.get_mother_handle():
fam.set_mother_handle(self.p1)
if fam.get_father_handle() == None and fam.get_mother_handle() == None:
self.delete_empty_family(fam)
self.delete_empty_family(fam,trans)
data = cursor.next()
def remove_marriage(self,family,person,trans):