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

* src/plugins/RelCalc.py: use empty string instead of None

Browse Source 
* src/EditPerson.py: pychecker fixes
* src/EditPlace.py: pychecker fixes
* src/EditSource.py: pychecker fixes
* src/GenericFilter.py: pychecker fixes
* src/GrampsCfg.py: pychecker fixes
* src/ImageSelect.py: pychecker fixes
* src/ListModel.py: pychecker fixes
* src/MediaView.py; pychecker fixes
* src/MergeData.py: pychecker fixes
* src/PedView.py: pychecker fixes
* src/PeopleView.py: pychecker fixes
* src/PlaceView.py: pychecker fixes
* src/Plugins.py: pychecker fixes
* src/RelImage.py: pychecker fixes
* src/Relationship.py: pychecker fixes


svn: r3450
This commit is contained in:
Don Allingham
2004-08-20 12:11:56 +00:00
parent 182bf44509
commit 0175cf1bbf
17 changed files with 325 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
gramps2/src/MergeData.py
View File

@@ -231,9 +231,9 @@ class MergePeople:
one.add_source_reference(xsrc)
def on_merge_clicked(self,obj):
list = self.p1.get_alternate_names()[:]
lst = self.p1.get_alternate_names()[:]
for xdata in self.p2.get_alternate_names():
for data in list:
for data in lst:
if data.are_equal(xdata):
self.copy_note(xdata,data)
self.copy_sources(xdata,data)
@@ -241,9 +241,9 @@ class MergePeople:
else:
self.p1.add_alternate_name(xdata)
list = self.p1.get_attribute_list()[:]
lst = self.p1.get_attribute_list()[:]
for xdata in self.p2.get_attribute_list():
for data in list:
for data in lst:
if data.get_type() == xdata.get_type() and \
data.getValue() == xdata.get_value():
self.copy_note(xdata,data)
@@ -252,9 +252,9 @@ class MergePeople:
else:
self.p1.add_attribute(xdata)
list = self.p1.get_event_list()[:]
lst = self.p1.get_event_list()[:]
for xdata in self.p2.get_event_list():
for data in list:
for data in lst:
if data.are_equal(xdata):
self.copy_note(xdata,data)
self.copy_sources(xdata,data)
@@ -262,9 +262,9 @@ class MergePeople:
else:
self.p1.add_event(xdata)
list = self.p1.get_url_list()[:]
lst = self.p1.get_url_list()[:]
for xdata in self.p2.get_url_list():
for data in list:
for data in lst:
if data.are_equal(xdata):
break
else:
@@ -785,14 +785,14 @@ def is_initial(name):
#
#
#---------------------------------------------------------------------
def ancestors_of(p1,list):
def ancestors_of(p1,lst):
if p1 == None:
return
list.append(p1)
lst.append(p1)
f1 = p1.get_main_parents_family_handle()
if f1 != None:
ancestors_of(f1.get_father_handle(),list)
ancestors_of(f1.get_mother_handle(),list)
ancestors_of(f1.get_father_handle(),lst)
ancestors_of(f1.get_mother_handle(),lst)
#---------------------------------------------------------------------
#
@@ -875,14 +875,14 @@ class MergePlaces:
self.p1.set_note("%s\n\n%s" % (self.p1.get_note(),note))
if t2active:
list = [self.p1.get_main_location()] + self.p1.get_alternate_locations()
lst = [self.p1.get_main_location()] + self.p1.get_alternate_locations()
self.p1.set_main_location(self.p2.get_main_location())
for l in list:
for l in lst:
if not l.is_empty():
self.p1.add_alternate_locations(l)
else:
list = [self.p2.get_main_location()] + self.p2.get_alternate_locations()
for l in list:
lst = [self.p2.get_main_location()] + self.p2.get_alternate_locations()
for l in lst:
if not l.is_empty():
self.p1.add_alternate_locations(l)