From 718b786157da07288d005c7254f8f7ab00ebc1d5 Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Thu, 16 Feb 2017 11:36:26 -0500 Subject: [PATCH] Fix test failures if 'future' package is installed (#15005) The python 'future' module provides a 'builtins' package to emulate the py3 'builtins' modules. If installed, the unit tests that reference builtins.__import__ fail because the future 'builtins' is imported and it is missing __import__. Use ansible.compat.six.moves.builtins instead of importing 'builtins' or __builtin__ Fixes #14996 --- test/units/plugins/action/test_action.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/test/units/plugins/action/test_action.py b/test/units/plugins/action/test_action.py index 6f9013537d..3b0faa0b43 100644 --- a/test/units/plugins/action/test_action.py +++ b/test/units/plugins/action/test_action.py @@ -22,15 +22,9 @@ __metaclass__ = type import os -try: - import builtins -except ImportError: - import __builtin__ as builtins - - from ansible import constants as C from ansible.compat.six import text_type -from ansible.compat.six.moves import shlex_quote +from ansible.compat.six.moves import shlex_quote, builtins from ansible.compat.tests import unittest from ansible.compat.tests.mock import patch, MagicMock, mock_open