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

Bug 3018: ImportGrdb: remove calls to keys() dictionary method where possible

Browse Source 
svn: r12572
This commit is contained in:
Gerald Britton
2009-05-26 20:48:09 +00:00
parent 51f65aa02f
commit 5eb7e18dc6
47 changed files with 134 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/textreport/AncestorReport.py
View File

@@ -166,11 +166,9 @@ class AncestorReport(Report):
# get the entries out of the map, and sort them.
keys = self.map.keys()
keys.sort()
generation = 0
for key in keys :
for key in sorted(self.map):
# check the index number to see if we need to start a new generation
if generation == log2(key):

8
src/plugins/textreport/DetAncestralReport.py
View File

@@ -154,12 +154,10 @@ class DetAncestorReport(Report):
self.doc.write_text(title,mark)
self.doc.end_paragraph()
keys = self.map.keys()
keys.sort()
generation = 0
need_header = 1
for key in keys :
for key in sorted(self.map):
if generation == 0 or key >= 2**generation:
if self.pgbrk and generation > 0:
self.doc.page_break()
@@ -221,9 +219,7 @@ class DetAncestorReport(Report):
if self.dupperson:
# Check for duplicate record (result of distant cousins marrying)
keys = self.map.keys()
keys.sort()
for dkey in keys:
for dkey in sorted(self.map):
if dkey >= key:
break
if self.map[key] == self.map[dkey]:

11
src/plugins/textreport/DetDescendantReport.py
View File

@@ -157,7 +157,7 @@ class DetDescendantReport(Report):
for family_handle in person.get_family_handle_list():
family = self.database.get_family_from_handle(family_handle)
for child_ref in family.get_child_ref_list():
ix = max(self.map.keys())
ix = max(self.map)
self.apply_henry_filter(child_ref.ref, ix+1,
pid+HENRY[index], cur_gen+1)
index += 1
@@ -178,7 +178,7 @@ class DetDescendantReport(Report):
for family_handle in person.get_family_handle_list():
family = self.database.get_family_from_handle(family_handle)
for child_ref in family.get_child_ref_list():
ix = max(self.map.keys())
ix = max(self.map)
self.apply_mod_reg_filter_aux(child_ref.ref, ix+1, cur_gen+1)
def apply_mod_reg_filter(self,person_handle):
@@ -209,8 +209,7 @@ class DetDescendantReport(Report):
self.doc.write_text(title, mark)
self.doc.end_paragraph()
keys = self.map.keys()
keys.sort()
keys = sorted(self.map)
generation = 0
for generation in xrange(len(self.gen_keys)):
@@ -289,9 +288,7 @@ class DetDescendantReport(Report):
if self.dubperson:
# Check for duplicate record (result of distant cousins marrying)
keys = self.map.keys()
keys.sort()
for dkey in keys:
for dkey in sorted(self.map):
if dkey >= key:
break
if self.map[key] == self.map[dkey]:

7
src/plugins/textreport/EndOfLineReport.py
View File

@@ -142,12 +142,11 @@ class EndOfLineReport(Report):
self.doc.end_paragraph()
self.doc.start_table('EolTable','EOL-Table')
for generation in self.eol_map.keys():
for generation, handles in self.eol_map.iteritems():
self.write_generation_row(generation)
for person_handle in self.eol_map[generation].keys():
for person_handle, pedigrees in handles.iteritems():
self.write_person_row(person_handle)
for pedigree in self.eol_map[generation][person_handle]:
for pedigree in pedigrees:
self.write_pedigree_row(pedigree)
self.doc.end_table()

4
src/plugins/textreport/KinshipReport.py
View File

@@ -113,8 +113,8 @@ class KinshipReport(Report):
self.traverse_up(self.person.get_handle(), 1, 0)
# Write Kin
for Ga in self.kinship_map.keys():
for Gb in self.kinship_map[Ga]:
for Ga, Gbs in self.kinship_map.iteritems():
for Gb in Gbs:
# To understand these calculations, see:
# http://en.wikipedia.org/wiki/Cousin#Mathematical_definitions
x = min (Ga,Gb)

12
src/plugins/textreport/NumberOfAncestorsReport.py
View File

@@ -111,7 +111,7 @@ class NumberOfAncestorsReport(Report):
temp = thisgen
thisgen = {}
for person_handle in temp.keys():
for person_handle, person_data in temp.iteritems():
person = self.__db.get_person_from_handle(person_handle)
family_handle = person.get_main_parents_family_handle()
if family_handle:
@@ -120,16 +120,16 @@ class NumberOfAncestorsReport(Report):
mother_handle = family.get_mother_handle()
if father_handle:
thisgen[father_handle] = \
thisgen.get(father_handle, 0) + temp[person_handle]
thisgen.get(father_handle, 0) + person_data
all_people[father_handle] = \
all_people.get(father_handle, 0) + \
temp[person_handle]
person_data
if mother_handle:
thisgen[mother_handle] = \
thisgen.get(mother_handle, 0) + temp[person_handle]
thisgen.get(mother_handle, 0) + person_data
all_people[mother_handle] = \
all_people.get(mother_handle, 0) + \
temp[person_handle]
person_data
if( total_theoretical != 1 ):
percent = '(%3.2f%%)' % (( sum(all_people.values()) / (total_theoretical-1) ) * 100)
@@ -142,7 +142,7 @@ class NumberOfAncestorsReport(Report):
"%(last_generation)d is %(count)d. %(percent)s") % {
'second_generation' : 2,
'last_generation' : gen,
'count' : len(all_people.keys()),
'count' : len(all_people),
'percent' : percent}
self.doc.start_paragraph('NOA-Normal')