From 9265016b95abf527bae2995dcce5e94b13e3dee2 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <a.badger@gmail.com>
Date: Fri, 7 Oct 2016 11:12:16 -0700
Subject: [PATCH] Fix a test failure when run on a system with python-future
 installed.

---
 test/units/module_utils/test_basic.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/test/units/module_utils/test_basic.py b/test/units/module_utils/test_basic.py
index 24b3214f579..6da86db2a11 100644
--- a/test/units/module_utils/test_basic.py
+++ b/test/units/module_utils/test_basic.py
@@ -27,13 +27,9 @@ import os
 import sys
 from io import BytesIO, StringIO
 
-try:
-    import builtins
-except ImportError:
-    import __builtin__ as builtins
-
 from units.mock.procenv import ModuleTestCase, swap_stdin_and_argv
 
+from ansible.compat.six.moves import builtins
 from ansible.compat.tests import unittest
 from ansible.compat.tests.mock import patch, MagicMock, mock_open, Mock, call