Update import paths for loader_directory

lib/galaxy/tool_util/deps/dockerfiles.py

@@ -5,7 +5,7 @@ from ..deps import commands
 from ..deps import docker_util
 from ..deps.container_classes import docker_cache_path
 from ..deps.requirements import parse_requirements_from_xml
-from ...tools import loader_directory
+from .. import loader_directory
 
 log = logging.getLogger(__name__)
 

lib/tool_shed/metadata/metadata_generator.py

@@ -8,7 +8,7 @@ from sqlalchemy import and_
 from galaxy import util
 from galaxy.tool_util.parser.interface import TestCollectionDef
 from galaxy.tools.data_manager.manager import DataManager
-from galaxy.tools.loader_directory import looks_like_a_tool
+from galaxy.tool_util.loader_directory import looks_like_a_tool
 from galaxy.tools.repositories import ValidationContext
 from galaxy.web import url_for
 from tool_shed.repository_types import util as rt_util

scripts/tool_shed/build_ts_whoosh_index.py

@@ -24,7 +24,7 @@ from whoosh.filedb.filestore import FileStorage
 sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, 'lib')))
 
 import galaxy.webapps.tool_shed.model.mapping
-from galaxy.tools.loader_directory import load_tool_elements_from_path
+from galaxy.tool_util.loader_directory import load_tool_elements_from_path
 from galaxy.util import (
     directory_hash_id,
     pretty_print_time_interval,