diff --git a/awx/lib/awx_display_callback/minimal.py b/awx/lib/awx_display_callback/minimal.py index de7694213e..579feeea24 100644 --- a/awx/lib/awx_display_callback/minimal.py +++ b/awx/lib/awx_display_callback/minimal.py @@ -25,4 +25,5 @@ import ansible # Because of the way Ansible loads plugins, it's not possible to import # ansible.plugins.callback.minimal when being loaded as the minimal plugin. Ugh. -execfile(os.path.join(os.path.dirname(ansible.__file__), 'plugins', 'callback', 'minimal.py')) +with open(os.path.join(os.path.dirname(ansible.__file__), 'plugins', 'callback', 'minimal.py')) as in_file: + exec(in_file.read()) diff --git a/awx/main/utils/ansible.py b/awx/main/utils/ansible.py index c94a1ea2a1..694cdd7b99 100644 --- a/awx/main/utils/ansible.py +++ b/awx/main/utils/ansible.py @@ -44,7 +44,7 @@ def could_be_playbook(project_path, dir_path, filename): # show up. matched = False try: - for n, line in enumerate(file(playbook_path)): + for n, line in enumerate(open(playbook_path)): if valid_playbook_re.match(line): matched = True # Any YAML file can also be encrypted with vault; diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py index c32821169a..c7c1d07a69 100644 --- a/awx/main/utils/common.py +++ b/awx/main/utils/common.py @@ -18,6 +18,7 @@ import contextlib import tempfile import six import psutil +from functools import reduce from StringIO import StringIO from decimal import Decimal diff --git a/awx/main/utils/filters.py b/awx/main/utils/filters.py index 2310361f88..f6a23de095 100644 --- a/awx/main/utils/filters.py +++ b/awx/main/utils/filters.py @@ -1,4 +1,5 @@ import re +from functools import reduce from pyparsing import ( infixNotation, opAssoc, diff --git a/awx/plugins/ansible_inventory/backport.py b/awx/plugins/ansible_inventory/backport.py index e0fd51c8cf..c44ee1f3d1 100755 --- a/awx/plugins/ansible_inventory/backport.py +++ b/awx/plugins/ansible_inventory/backport.py @@ -322,4 +322,5 @@ if __name__ == '__main__': imp.load_source('ansible.cli.inventory', __file__ + '.py', f) ansible_path = distutils.spawn.find_executable('ansible') sys.argv[0] = 'ansible-inventory' - execfile(ansible_path) + with open(ansible_path) as in_file: + exec(in_file.read()) diff --git a/tools/scripts/compilemessages.py b/tools/scripts/compilemessages.py index 36c68a8269..62dfadfbfc 100644 --- a/tools/scripts/compilemessages.py +++ b/tools/scripts/compilemessages.py @@ -31,7 +31,7 @@ def has_bom(fn): return sample.startswith((codecs.BOM_UTF8, codecs.BOM_UTF16_LE, codecs.BOM_UTF16_BE)) -def popen_wrapper(args, os_err_exc_type=StandardError, stdout_encoding='utf-8'): +def popen_wrapper(args, os_err_exc_type=Exception, stdout_encoding='utf-8'): """ Friendly wrapper around Popen. Returns stdout output, stderr output and OS status code.