From b76e0559dd3b3ba464b40acec10088f8d68da568 Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 19 Oct 2017 14:49:54 -0400 Subject: [PATCH] Fix lint --- lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py | 9 ++++----- .../galaxy_install/grids/admin_toolshed_grids.py | 2 -- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py index 104eadaa744..a6a3b67d697 100644 --- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py @@ -795,10 +795,10 @@ class AdminToolshed(AdminGalaxy): clause_list.append(trans.install_model.ToolShedRepository.table.c.id == tsr_id) query = trans.install_model.context.current.query(trans.install_model.ToolShedRepository).filter(or_(*clause_list)) return trans.fill_template('admin/tool_shed_repository/monitor_repository_installation.mako', - tool_shed_repositories=tool_shed_repositories, - query=query, - message=escape(kwd.get('message')), - status=kwd.get('status')) + tool_shed_repositories=tool_shed_repositories, + query=query, + message=escape(kwd.get('message')), + status=kwd.get('status')) @web.json @web.require_admin @@ -945,7 +945,6 @@ class AdminToolshed(AdminGalaxy): tool_panel_section_keys=tool_panel_section_keys, tool_path=tool_path, tool_shed_url=tool_shed_url) - encoded_kwd, query, tool_shed_repositories, encoded_repository_ids = \ install_repository_manager.initiate_repository_installation(installation_dict) return trans.fill_template('admin/tool_shed_repository/monitor_repository_installation.mako', diff --git a/lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py b/lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py index 7797c02b146..b20b6f89ca9 100644 --- a/lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py +++ b/lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py @@ -1,7 +1,5 @@ import logging -from sqlalchemy import false, or_ - from galaxy import util from galaxy.model import tool_shed_install from galaxy.web import url_for