diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index fae3cb2c5..397245c5b 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -29,6 +29,8 @@ * src/data/gramps.schemas: Correct the default and the description of the toolbar key. + * src/PluginMgr.py: Minor fixes. + 2005-01-07 Don Allingham * src/gramps.glade: removal of more OptionMenus in favor of ComboBoxes diff --git a/gramps2/src/PluginMgr.py b/gramps2/src/PluginMgr.py index 2bfe6011e..d94644c8e 100644 --- a/gramps2/src/PluginMgr.py +++ b/gramps2/src/PluginMgr.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2004 Donald N. Allingham +# Copyright (C) 2000-2005 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -35,7 +35,6 @@ importers, exporters, and document generators. #------------------------------------------------------------------------- import os import sys -import string import re from gettext import gettext as _ @@ -99,7 +98,7 @@ def load_plugins(direct): # if the directory does not exist, do nothing if not os.path.isdir(direct): - return + return True # if the path has not already been loaded, save it in the loaddir_list # list for use on reloading @@ -146,7 +145,7 @@ def reload_plugins(obj=None,junk1=None,junk2=None,junk3=None): """Treated as a callback, causes all plugins to get reloaded. This is useful when writing and debugging a plugin""" - pymod = compile(r"^(.*)\.py$") + pymod = re.compile(r"^(.*)\.py$") global _success_list,attempt_list,loaddir_list,failmsg_list