From d7ed11477bbe50e4f058f389ebb753b412ac7000 Mon Sep 17 00:00:00 2001 From: Eric Rasche Date: Fri, 26 Feb 2016 14:50:41 +0000 Subject: [PATCH] Whitespace changes for travis --- lib/galaxy/web/base/interactive_environments.py | 13 ++++++++----- lib/galaxy/web/proxy/__init__.py | 11 +++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lib/galaxy/web/base/interactive_environments.py b/lib/galaxy/web/base/interactive_environments.py index 8e410840439..7f432a71038 100644 --- a/lib/galaxy/web/base/interactive_environments.py +++ b/lib/galaxy/web/base/interactive_environments.py @@ -59,11 +59,14 @@ class InteractiveEnvironmentRequest(object): # This duplicates the logic in the proxy manager if self.attr.galaxy_config.dynamic_proxy_external_proxy: - self.attr.proxy_prefix = '/'.join(('', - self.attr.galaxy_config.cookie_path.strip('/'), - self.attr.galaxy_config.dynamic_proxy_prefix.strip('/'), - self.attr.viz_id, - )) + self.attr.proxy_prefix = '/'.join( + ( + '', + self.attr.galaxy_config.cookie_path.strip('/'), + self.attr.galaxy_config.dynamic_proxy_prefix.strip('/'), + self.attr.viz_id, + ) + ) else: self.attr.proxy_prefix = '' diff --git a/lib/galaxy/web/proxy/__init__.py b/lib/galaxy/web/proxy/__init__.py index bba5eab4f05..5fea43373a5 100644 --- a/lib/galaxy/web/proxy/__init__.py +++ b/lib/galaxy/web/proxy/__init__.py @@ -58,10 +58,10 @@ class ProxyManager(object): authentication = AuthenticationToken(trans) proxy_requests = ProxyRequests(host=host, port=port) self.proxy_ipc.handle_requests( - authentication, - proxy_requests, - '/%s' % route_name, - container_ids + authentication, + proxy_requests, + '/%s' % route_name, + container_ids ) # TODO: These shouldn't need to be request.host and request.scheme - # though they are reasonable defaults. @@ -98,6 +98,7 @@ class ProxyLauncher(object): def launch_proxy_command(self, config): raise NotImplementedError() + class NodeProxyLauncher(object): def launch_proxy_command(self, config): @@ -114,6 +115,7 @@ class NodeProxyLauncher(object): command = [ path_to_application ] + args return command + class GolangProxyLauncher(object): def launch_proxy_command(self, config): @@ -224,6 +226,7 @@ class SqliteProxyIpc(object): finally: conn.close() + class RestGolangProxyIpc(object): def __init__(self, config):