Fix import order

lib/galaxy/model/__init__.py

@@ -5,7 +5,6 @@ Naming: try to use class names that have a distinct plural form so that
 the relationship cardinalities are obvious (e.g. prefer Dataset to Data)
 """
 import errno
-import json
 import logging
 import numbers
 import operator
@@ -30,8 +29,8 @@ from galaxy.managers import tags
 from galaxy.model.item_attrs import UsesAnnotations
 from galaxy.model.util import pgcalc
 from galaxy.security import get_permitted_actions
-from galaxy.util import (directory_hash_id, Params, ready_name_for_url,
-                         restore_text, unicodify, unique_id)
+from galaxy.util import (directory_hash_id, ready_name_for_url,
+                         unicodify, unique_id)
 from galaxy.util.bunch import Bunch
 from galaxy.util.dictifiable import Dictifiable
 from galaxy.util.hash_util import new_secure_hash

lib/galaxy/web/form_builder.py

@@ -4,14 +4,9 @@ Classes for generating HTML forms
 from __future__ import print_function
 
 import logging
-from cgi import escape
-
-from six import string_types
 
 from galaxy.util import (
-    asbool,
-    restore_text,
-    unicodify
+    asbool
 )
 
 log = logging.getLogger(__name__)
@@ -167,7 +162,7 @@ class WorkflowField(BaseField):
 
 
 class WorkflowMappingField(BaseField):
-    def __init__(self, name, user=None, value=None, **kwd):
+    def __init__(self, name, user=None, value=None, **kwds):
         super(WorkflowMappingField, self).__init__(name, value, **kwds)
         self.user = user
 

lib/galaxy/webapps/galaxy/api/library_contents.py

@@ -32,10 +32,6 @@ from galaxy.web.base.controller import (
     UsesLibraryMixin,
     UsesLibraryMixinItems
 )
-from galaxy.web.form_builder import (
-    AddressField,
-    CheckboxField,
-)
 log = logging.getLogger(__name__)
 
 

lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py

@@ -9,7 +9,6 @@ import tool_shed.repository_types.util as rt_util
 from galaxy import util, web
 from galaxy.tools.deps import views
 from galaxy.util import unicodify
-from tool_shed.util.form_util import CheckboxField
 from tool_shed.galaxy_install import (
     dependency_display,
     install_manager
@@ -33,6 +32,7 @@ from tool_shed.util import (
     tool_util,
     workflow_util
 )
+from tool_shed.util.form_util import CheckboxField
 from tool_shed.util.web_util import escape
 from .admin import AdminGalaxy
 

lib/tool_shed/galaxy_install/metadata/installed_repository_metadata_manager.py

@@ -5,14 +5,13 @@ from sqlalchemy import false
 
 from galaxy import util
 from galaxy.util import inflector
-from tool_shed.util.form_util import SelectField
 from tool_shed.galaxy_install.tools import tool_panel_manager
 from tool_shed.metadata import metadata_generator
 from tool_shed.util import common_util
 from tool_shed.util import repository_util
 from tool_shed.util import tool_util
 from tool_shed.util import xml_util
-
+from tool_shed.util.form_util import SelectField
 log = logging.getLogger(__name__)
 
 

lib/tool_shed/grids/util.py

@@ -1,7 +1,7 @@
 import logging
 
-from tool_shed.util.form_util import SelectField
 from tool_shed.util import hg_util, metadata_util
+from tool_shed.util.form_util import SelectField
 
 log = logging.getLogger(__name__)
 

lib/tool_shed/metadata/repository_metadata_manager.py

@@ -8,9 +8,9 @@ from galaxy.util import inflector
 from tool_shed.metadata import metadata_generator
 from tool_shed.repository_types import util as rt_util
 from tool_shed.repository_types.metadata import TipOnly
-from tool_shed.util.form_util import SelectField
 from tool_shed.util import (basic_util, common_util, hg_util, metadata_util,
     repository_util, shed_util_common as suc, tool_util)
+from tool_shed.util.form_util import SelectField
 
 log = logging.getLogger(__name__)
 

lib/tool_shed/util/form_util.py

@@ -10,7 +10,6 @@ from six import string_types
 
 from galaxy.util import (
     asbool,
-    restore_text,
     unicodify
 )
 
@@ -49,6 +48,7 @@ class BaseField(object):
             'help'      : self.help
         }
 
+
 class CheckboxField(BaseField):
     """
     A checkbox (boolean input)

lib/tool_shed/util/tool_dependency_util.py

@@ -5,9 +5,11 @@ import shutil
 from sqlalchemy import and_
 
 from galaxy import util
-from tool_shed.util.form_util import SelectField
-from tool_shed.util import hg_util
-from tool_shed.util import xml_util
+from tool_shed.util import (
+    form_util,
+    hg_util,
+    xml_util
+)
 
 log = logging.getLogger(__name__)
 
@@ -18,7 +20,7 @@ def build_tool_dependencies_select_field(app, tool_shed_repository, name, multip
     Generate a SelectField consisting of the current list of tool dependency ids
     for an installed tool shed repository.
     """
-    tool_dependencies_select_field = SelectField(name=name, multiple=multiple, display=display)
+    tool_dependencies_select_field = form_util.SelectField(name=name, multiple=multiple, display=display)
     for tool_dependency in tool_shed_repository.tool_dependencies:
         if uninstalled_only:
             if tool_dependency.status not in [app.install_model.ToolDependency.installation_status.NEVER_INSTALLED,

lib/tool_shed/util/tool_util.py

@@ -7,8 +7,8 @@ from galaxy import util
 from galaxy.datatypes.sniff import is_column_based
 from galaxy.util import checkers
 from galaxy.util.expressions import ExpressionContext
-from tool_shed.util.form_util import SelectField
 from tool_shed.util import basic_util
+from tool_shed.util.form_util import SelectField
 
 log = logging.getLogger(__name__)