From 8867cbeacc1393d7207a7f022bd7af8596da7e13 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Fri, 28 Apr 2006 19:48:48 +0000 Subject: [PATCH] 2006-04-28 Don Allingham * src/AutoComp.py (StandardCustomSelector.fill): handle unicode in addition to str * src/ScratchPad.py (ScratchPadWindow.__init__): fix call to set_window, passing proper arguments svn: r6489 --- gramps2/ChangeLog | 6 ++++++ gramps2/src/AutoComp.py | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index f6ef2191f..b213f4afd 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,9 @@ +2006-04-28 Don Allingham + * src/AutoComp.py (StandardCustomSelector.fill): handle unicode + in addition to str + * src/ScratchPad.py (ScratchPadWindow.__init__): fix call to + set_window, passing proper arguments + 2006-04-28 Alex Roitman * src/ScratchPad.py (ScratchPadWindow.__init__): Allow only one instance; translate label; remove unneeded event handlers. diff --git a/gramps2/src/AutoComp.py b/gramps2/src/AutoComp.py index 8b5fa54b5..93f2a4947 100644 --- a/gramps2/src/AutoComp.py +++ b/gramps2/src/AutoComp.py @@ -175,9 +175,9 @@ class StandardCustomSelector: if self.additional: for event_type in self.additional: - if type(event_type) == str: + if type(event_type) == str or type(event_type) == unicode : self.store.append(row=[self.custom_key, event_type]) - elif type(event_type) == str: + elif type(event_type) == tuple: self.store.append(row=[event_type[0], event_type[1]]) else: self.store.append(row=[int(event_type), str(event_type[1])])