From 2bece278c0bae4a899d46f5006801a0d7fe490e9 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Sun, 1 Aug 2010 18:18:29 +0000 Subject: [PATCH] Fix error handling when merging people svn: r15675 --- src/Merge/mergeperson.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Merge/mergeperson.py b/src/Merge/mergeperson.py index 643c4f981..6d4a2b447 100644 --- a/src/Merge/mergeperson.py +++ b/src/Merge/mergeperson.py @@ -335,8 +335,8 @@ class MergePeople(ManagedWindow.ManagedWindow): try: query = MergePersonQuery(self.dbstate, phoenix, titanic) query.execute() - except MergeError, errstr: - ErrorDialog( _("Cannot merge people"), errstr) + except MergeError, err: + ErrorDialog( _("Cannot merge people"), str(err)) self.uistate.viewmanager.active_page.selection.unselect_path( unselect_path) self.uistate.set_busy_cursor(False)