diff --git a/src/gen/db/base.py b/src/gen/db/base.py index 8dafb3f19..0e5142157 100644 --- a/src/gen/db/base.py +++ b/src/gen/db/base.py @@ -1364,7 +1364,7 @@ class GrampsDbBase(Callback): data = cursor.next() cursor.close() slist.sort() - return map(lambda x: x[1], slist) + return [x[1] for x in slist] else: return self.all_handles(self.person_map) return [] @@ -1386,8 +1386,7 @@ class GrampsDbBase(Callback): data = cursor.next() cursor.close() slist.sort() - val = map(lambda x: x[1], slist) - return val + return [x[1] for x in slist] else: return self.all_handles(self.place_map) return [] diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py index e9639be94..63fcc991d 100644 --- a/src/plugins/NarrativeWeb.py +++ b/src/plugins/NarrativeWeb.py @@ -3235,9 +3235,9 @@ def sort_people(db, handle_list): temp_list = sname_sub.keys() temp_list.sort(locale.strcoll) for name in temp_list: - slist = map(lambda x: (sortnames[x], x), sname_sub[name]) + slist = [(sortnames[x], x) for x in sname_sub[name]] slist.sort(lambda x, y: locale.strcoll(x[0], y[0])) - entries = map(lambda x: x[1], slist) + entries = [x[1] for x in slist] sorted_lists.append((name, entries)) return sorted_lists diff --git a/src/plugins/WriteGeneWeb.py b/src/plugins/WriteGeneWeb.py index a3ba47f64..7587f04fe 100644 --- a/src/plugins/WriteGeneWeb.py +++ b/src/plugins/WriteGeneWeb.py @@ -129,10 +129,10 @@ class GeneWebWriterOptionBox: def on_restrict_toggled(self, restrict): active = restrict.get_active () - map (lambda x: x.set_sensitive (active), - [self.topDialog.get_widget("living"), - self.topDialog.get_widget("notes"), - self.topDialog.get_widget("sources")]) + for x in [self.topDialog.get_widget("living"), + self.topDialog.get_widget("notes"), + self.topDialog.get_widget("sources")]: + x.set_sensitive(active) def parse_options(self): self.restrict = self.topDialog.get_widget("restrict").get_active()