From f52f7f6a62294564ce49d37f77abd4d91dd69795 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Tue, 22 Jan 2019 09:20:40 +0000 Subject: [PATCH] ansible: merge away unused return values / functions. --- ansible_mitogen/connection.py | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/ansible_mitogen/connection.py b/ansible_mitogen/connection.py index 4552fd91..2f30e5b4 100644 --- a/ansible_mitogen/connection.py +++ b/ansible_mitogen/connection.py @@ -580,7 +580,7 @@ class Connection(ansible.plugins.connection.ConnectionBase): ) if spec.mitogen_via(): - stack, seen_names = self._stack_from_spec( + stack = self._stack_from_spec( self._spec_from_via(spec.mitogen_via()), stack=stack, seen_names=seen_names + (spec.inventory_name(),), @@ -590,7 +590,7 @@ class Connection(ansible.plugins.connection.ConnectionBase): if spec.become(): stack += (CONNECTION_METHOD[spec.become_method()](spec),) - return stack, seen_names + return stack def _connect_broker(self): """ @@ -604,15 +604,6 @@ class Connection(ansible.plugins.connection.ConnectionBase): broker=self.broker, ) - def _build_spec(self): - inventory_hostname = self.inventory_hostname - return ansible_mitogen.transport_config.PlayContextSpec( - connection=self, - play_context=self._play_context, - transport=self.transport, - inventory_name=inventory_hostname, - ) - def _build_stack(self): """ Construct a list of dictionaries representing the connection @@ -620,9 +611,14 @@ class Connection(ansible.plugins.connection.ConnectionBase): additionally used by the integration tests "mitogen_get_stack" action to fetch the would-be connection configuration. """ - config = self._build_spec() - stack, _ = self._stack_from_spec(config) - return stack + return self._stack_from_spec( + ansible_mitogen.transport_config.PlayContextSpec( + connection=self, + play_context=self._play_context, + transport=self.transport, + inventory_name=self.inventory_hostname, + ) + ) def _connect_stack(self, stack): """