From 2444226acc44b79a7a829e1be5b2efff8a4bb2d7 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Sun, 16 Jan 2005 17:50:32 +0000 Subject: [PATCH] * src/Plugins.py (reload_plugins): Check for status. * src/Report.py: pychecker fixes svn: r3916 --- gramps2/ChangeLog | 4 ++++ gramps2/src/Plugins.py | 3 ++- gramps2/src/Report.py | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index fc658136d..1f5cb030b 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2005-01-16 Alex Roitman + * src/Plugins.py (reload_plugins): Check for status. + * src/Report.py: pychecker fixes + 2005-01-15 Don Allingham * src/EditPerson.py: don't use quote date * src/PeopleModel.py: remove BOLD diff --git a/gramps2/src/Plugins.py b/gramps2/src/Plugins.py index 1d3cea638..213f983dd 100644 --- a/gramps2/src/Plugins.py +++ b/gramps2/src/Plugins.py @@ -707,7 +707,8 @@ def reload_plugins(obj=None,junk1=None,junk2=None,junk3=None): PluginStatus() else: global status_up - status_up.close(None) + if status_up: + status_up.close(None) status_up = None #------------------------------------------------------------------------- diff --git a/gramps2/src/Report.py b/gramps2/src/Report.py index cc531bf29..06e55440c 100644 --- a/gramps2/src/Report.py +++ b/gramps2/src/Report.py @@ -1755,7 +1755,7 @@ def report(database,person,report_class,options_class,translated_name,name,categ dialog = dialog_class(database,person,options_class,name,translated_name) response = dialog.window.run() - if response == True: + if response: try: MyReport = report_class(dialog.db,dialog.person,dialog.options) MyReport.begin_report() @@ -1789,6 +1789,7 @@ def write_book_item(database,person,report_class,options_class): except: import DisplayTrace DisplayTrace.DisplayTrace() + return None # Command-line generic task def cl_report(database,name,category,report_class,options_class,options_str_dict):