From ed4fd9be67d472f5bb2d486472a5a8395d662ca1 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Fri, 15 May 2020 17:00:35 -0700 Subject: [PATCH] Code cleanup in `ansible-inventory`. --- changelogs/fragments/ansible-inventory-code-cleanup.yml | 3 +++ lib/ansible/cli/inventory.py | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 changelogs/fragments/ansible-inventory-code-cleanup.yml diff --git a/changelogs/fragments/ansible-inventory-code-cleanup.yml b/changelogs/fragments/ansible-inventory-code-cleanup.yml new file mode 100644 index 00000000000..79fa39df200 --- /dev/null +++ b/changelogs/fragments/ansible-inventory-code-cleanup.yml @@ -0,0 +1,3 @@ +bugfixes: + - Use ``sys.exit`` instead of ``exit`` in ``ansible-inventory``. + - Remove unused Python imports in ``ansible-inventory``. diff --git a/lib/ansible/cli/inventory.py b/lib/ansible/cli/inventory.py index f8bf3c703cf..9f423747e5a 100644 --- a/lib/ansible/cli/inventory.py +++ b/lib/ansible/cli/inventory.py @@ -5,6 +5,8 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type +import sys + import argparse from operator import attrgetter @@ -13,9 +15,7 @@ from ansible import context from ansible.cli import CLI from ansible.cli.arguments import option_helpers as opt_help from ansible.errors import AnsibleError, AnsibleOptionsError -from ansible.inventory.host import Host from ansible.module_utils._text import to_bytes, to_native -from ansible.plugins.loader import vars_loader from ansible.utils.vars import combine_vars from ansible.utils.display import Display from ansible.vars.plugins import get_vars_from_inventory_sources, get_vars_from_path @@ -161,9 +161,9 @@ class InventoryCLI(CLI): f.write(results) except (OSError, IOError) as e: raise AnsibleError('Unable to write to destination file (%s): %s' % (to_native(outfile), to_native(e))) - exit(0) + sys.exit(0) - exit(1) + sys.exit(1) @staticmethod def dump(stuff):