Use built-in functions to replace for loops:

Old code:

for x in y:
  f(x)

New Code:

map(f, y)

Also use defaultdict instead of simple dict when advantageous and use list comprehensions
instead of for loops where map() could be used but requires lambdas.


svn: r14135
This commit is contained in:
Gerald Britton
2010-01-25 17:45:21 +00:00
parent fbb8fa2a52
commit 8f0582df8a
49 changed files with 125 additions and 188 deletions

View File

@@ -457,10 +457,8 @@ class MergePeople(object):
self.p2.get_source_references())
# media
for photo in self.p1.get_media_list():
new.add_media_reference(photo)
for photo in self.p2.get_media_list():
new.add_media_reference(photo)
map(new.add_media_reference, self.p1.get_media_list())
map(new.add_media_reference, self.p2.get_media_list())
# note
new.set_note_list(self.p1.get_note_list() +
@@ -847,8 +845,7 @@ class MergePeople(object):
# merge family attributes
for xdata in src_family.get_attribute_list():
tgt_family.add_attribute(xdata)
map(tgt_family.add_attribute, src_family.get_attribute_list())
# merge family notes
tgt_family.set_note_list(tgt_family.get_note_list() +
@@ -860,8 +857,7 @@ class MergePeople(object):
# merge multimedia objects
for photo in src_family.get_media_list():
tgt_family.add_media_reference(photo)
map(tgt_family.add_media_reference, src_family.get_media_list())
def adjust_family_pointers(self, tgt_family, src_family, trans):
"""