From f76bf9a9b1f316de550270108ae86bdf736faaae Mon Sep 17 00:00:00 2001
From: Nate Coraor <nate@bx.psu.edu>
Date: Wed, 18 Jun 2014 16:41:53 -0400
Subject: [PATCH] Don't duplicate util.submodules in runner state handler
 factory.

---
 .../jobs/runners/state_handler_factory.py     | 37 ++-----------------
 1 file changed, 3 insertions(+), 34 deletions(-)

diff --git a/lib/galaxy/jobs/runners/state_handler_factory.py b/lib/galaxy/jobs/runners/state_handler_factory.py
index 27f230ff819..724de7d8c7e 100644
--- a/lib/galaxy/jobs/runners/state_handler_factory.py
+++ b/lib/galaxy/jobs/runners/state_handler_factory.py
@@ -1,8 +1,8 @@
-# Shamelessly stolen from the LWR.
-
 import os
 import logging
 
+from galaxy.util.submodules import submodules
+
 import galaxy.jobs.runners.state_handlers
 
 
@@ -11,40 +11,9 @@ log = logging.getLogger(__name__)
 def build_state_handlers():
     return _get_state_handlers_dict()
 
-def _get_modules():
-    """
-    >>> 'galaxy.jobs.runners.state_handlers.resubmit' in _get_modules()
-    True
-    """
-    state_handlers_dir = galaxy.jobs.runners.state_handlers.__path__[0]
-    module_names = []
-    for fname in os.listdir(state_handlers_dir):
-        if not(fname.startswith("_")) and fname.endswith(".py"):
-            module_name = "galaxy.jobs.runners.state_handlers.%s" % fname[:-len(".py")]
-            module_names.append(module_name)
-    log.debug('module_names: %s', module_names)
-    return module_names
-
-def _load_modules():
-    modules = []
-    for module_name in _get_modules():
-        try:
-            log.debug('Importing %s', module_name)
-            module = __import__(module_name)
-            for comp in module_name.split(".")[1:]:
-                module = getattr(module, comp)
-            modules.append(module)
-        except BaseException as exception:
-            exception_str = str(exception)
-            message = "%s module could not be loaded: %s" % (module_name, exception_str)
-            log.warn(message)
-            continue
-
-    return modules
-
 def _get_state_handlers_dict():
     state_handlers = {}
-    for module in _load_modules():
+    for module in submodules(galaxy.jobs.runners.state_handlers):
         for func in module.__all__:
             if func not in state_handlers:
                 state_handlers[func] = []