Update module_utils.six to latest (#22855)

* Update module_utils.six to latest

We've been held back on the version of six we could use on the module
side to 1.4.x because of python-2.4 compatibility.  Now that our minimum
is Python-2.6, we can update to the latest version of six in
module_utils and get rid of the second copy in lib/ansible/compat.

test/units/module_utils/basic/test_run_command.py

@@ -27,7 +27,7 @@ from io import BytesIO, StringIO
 
 import pytest
 
-from ansible.compat.six import PY3
+from ansible.module_utils.six import PY3
 from ansible.compat.tests import unittest
 from ansible.compat.tests.mock import call, MagicMock, Mock, patch, sentinel
 

test/units/module_utils/test_basic.py

@@ -29,9 +29,9 @@ from io import BytesIO, StringIO
 
 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
+from ansible.module_utils.six.moves import builtins
 
 realimport = builtins.__import__
 

test/units/module_utils/test_postgresql.py

@@ -3,10 +3,10 @@ import sys
 
 from ansible.compat.tests import unittest
 from ansible.compat.tests.mock import patch, MagicMock
-from ansible.compat.six.moves import builtins
 
-from ansible.module_utils._text import to_native
 from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.six.moves import builtins
+from ansible.module_utils._text import to_native
 from units.mock.procenv import swap_stdin_and_argv
 
 

test/units/module_utils/test_text.py

@@ -20,8 +20,8 @@
 from __future__ import (absolute_import, division)
 __metaclass__ = type
 
-from ansible.compat.six import PY3
 from ansible.compat.tests import unittest
+from ansible.module_utils.six import PY3
 from units.mock.generator import add_method