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

svn: r12572

src/plugins/tool/DumpGenderStats.py

@@ -49,11 +49,10 @@ class DumpGenderStats(Tool.Tool, ManagedWindow.ManagedWindow):
                                                  self.__class__)
 
         stats_list = []
-
-        for name in dbstate.db.genderStats.stats.keys():
+        for name, value in dbstate.db.genderStats.stats.iteritems():
             stats_list.append(
                 (name,)
-                + dbstate.db.genderStats.stats[name]
+                + value
                 + (_GENDER[dbstate.db.genderStats.guess_gender(name)],)
                 )
 
@@ -81,10 +80,10 @@ class DumpGenderStats(Tool.Tool, ManagedWindow.ManagedWindow):
             self.show()
             
         else:
-            print "\t%s\t%s\t%s\t%s\t%s\n" % (
-                'Name','Male','Female','Unknown','Guess')
+            print '\t%s'*5 % ('Name','Male','Female','Unknown','Guess')
+            print
             for entry in stats_list:
-                print "\t%s\t%s\t%s\t%s\t%s" % entry
+                print '\t%s'*5 % entry
 
     def build_menu_names(self, obj):
         return (self.label,None)

src/plugins/tool/EventCmp.py

@@ -358,8 +358,8 @@ class DisplayChart(ManagedWindow.ManagedWindow):
                 else:
                     the_map[name] = 1
 
-        unsort_list = [ (the_map[item], item) for item in the_map.keys() ]
-        unsort_list.sort(by_value)
+        unsort_list = sorted([(d, k) for k,d in the_map.iteritems()],by_value)
+        
         sort_list = [ item[1] for item in unsort_list ]
 ## Presently there's no Birth and Death. Instead there's Birth Date and
 ## Birth Place, as well as Death Date and Death Place.

src/plugins/tool/FindDupes.py

@@ -110,9 +110,7 @@ class Merge(Tool.Tool,ManagedWindow.ManagedWindow):
         use_soundex = self.options.handler.options_dict['soundex']
 
         my_menu = gtk.ListStore(str, object)
-        vals = _val2label.keys()
-        vals.sort()
-        for val in vals:
+        for val in sorted(_val2label):
             my_menu.append([_val2label[val], val])
 
         self.soundex_obj = top.get_object("soundex")
@@ -243,8 +241,7 @@ class Merge(Tool.Tool,ManagedWindow.ManagedWindow):
                     else:
                         self.map[p1key] = (p2key,chance)
 
-        self.list = self.map.keys()
-        self.list.sort()
+        self.list = sorted(self.map)
         self.length = len(self.list)
         self.progress.close()
 
@@ -575,10 +572,10 @@ class ShowMatches(ManagedWindow.ManagedWindow):
         GrampsDisplay.help(WIKI_HELP_PAGE , WIKI_HELP_SEC)    
     def redraw(self):
         list = []
-        for p1key in self.map.keys():
+        for p1key, p1data in self.map.iteritems():
             if p1key in self.dellist:
                 continue
-            (p2key,c) = self.map[p1key]
+            (p2key,c) = p1data
             if p1key == p2key:
                 continue
             list.append((c,p1key,p2key))
@@ -608,8 +605,8 @@ class ShowMatches(ManagedWindow.ManagedWindow):
 
     def on_update(self):
         self.dellist[self.p2] = self.p1
-        for key in self.dellist.keys():
-            if self.dellist[key] == self.p2:
+        for key, data in self.dellist.iteritems():
+            if data == self.p2:
                 self.dellist[key] = self.p1
         self.update()
         self.redraw()

src/plugins/tool/PHPGedViewConnector.py

@@ -127,7 +127,7 @@ class PHPGedViewConnector(object):
         result = []
         types = []
         if type == self.TYPE_ALL:
-            for entry in self.type_trans.keys():
+            for entry in self.type_trans:
                 types.append(entry)
         else:
             types.append(type)