Run update-copyright.py.

[hooke.git] / hooke / util / pluggable.py

diff --git a/hooke/util/pluggable.py b/hooke/util/pluggable.py
index f13b9a5bd26cc588ee78b31d22d1d0d306ae1f03..a3c2d5b8a16427b13d8491114c9829bd349d0c73 100644 (file)
--- a/hooke/util/pluggable.py
+++ b/hooke/util/pluggable.py
@@ -1,24 +1,25 @@
-# Copyright (C) 2010 W. Trevor King <wking@drexel.edu>
+# Copyright (C) 2010-2012 W. Trevor King <wking@drexel.edu>
 #
 # This file is part of Hooke.
 #
-# Hooke is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation, either
-# version 3 of the License, or (at your option) any later version.
+# Hooke is free software: you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
 #
-# Hooke is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# Hooke is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with Hooke.  If not, see
-# <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public License
+# along with Hooke.  If not, see <http://www.gnu.org/licenses/>.
 
-"""`pluggable`
+"""``pluggable`` provides utility functions for extensible plugin modules.
 """
 
+import logging
+
 from ..compat.odict import odict
 from .graph import Node, Graph
 
@@ -68,7 +69,14 @@ def submods(this_modname, submodnames):
         assert count > 0, 'No %s entries: %s' % (submodname, submodnames)
         assert count == 1, 'Multiple (%d) %s entries: %s' \
             % (count, submodname, submodnames)
-        this_mod = __import__(this_modname, fromlist=[submodname])
+        try:
+            this_mod = __import__(this_modname, fromlist=[submodname])
+        except ImportError, e:
+            # Use the root logger because the 'hooke' logger is
+            # configured by a Hooke instance after module imports.
+            logging.warn('could not import %s from %s: %s'
+                         % (submodname, this_modname, e))
+            continue
         submod = getattr(this_mod, submodname)
         yield (submodname, submod)
 
@@ -88,7 +96,12 @@ def construct_odict(this_modname, submodnames, class_selector,
             obj = getattr(submod, objname)
             if class_selector(obj):
                 if instantiate == True:
-                    obj = obj()
+                    try:
+                        obj = obj()
+                    except Exception, e:
+                        logging.error('could not instantiate %s from %s: %s'
+                                      % (obj, submodname, e))
+                        raise
                 name = getattr(obj, 'name', submodname)
                 objs[name] = obj
     return objs
@@ -112,7 +125,12 @@ def construct_graph(this_modname, submodnames, class_selector,
         for objname in dir(submod):
             obj = getattr(submod, objname)
             if class_selector(obj):
-                instance = obj()
+                try:
+                    instance = obj()
+                except Exception, e:
+                    logging.error('could not instantiate %s from %s: %s'
+                                  % (obj, submodname, e))
+                    raise
                 if assert_name_match == True and instance.name != submodname:
                     raise Exception(
                         'Instance name %s does not match module name %s'