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.

lib/ansible/galaxy/__init__.py

@@ -25,9 +25,8 @@ __metaclass__ = type
 
 import os
 
-from ansible.compat.six import string_types
-
 from ansible.errors import AnsibleError
+from ansible.module_utils.six import string_types
 
 #      default_readme_template
 #      default_meta_template

lib/ansible/galaxy/api.py

@@ -25,11 +25,11 @@ __metaclass__ = type
 import json
 
 import ansible.constants as C
-from ansible.compat.six import string_types
-from ansible.compat.six.moves.urllib.error import HTTPError
-from ansible.compat.six.moves.urllib.parse import quote as urlquote, urlencode
 from ansible.errors import AnsibleError
 from ansible.galaxy.token import GalaxyToken
+from ansible.module_utils.six import string_types
+from ansible.module_utils.six.moves.urllib.error import HTTPError
+from ansible.module_utils.six.moves.urllib.parse import quote as urlquote, urlencode
 from ansible.module_utils._text import to_native, to_text
 from ansible.module_utils.urls import open_url
 

lib/ansible/galaxy/login.py

@@ -25,10 +25,9 @@ __metaclass__ = type
 import getpass
 import json
 
-from ansible.compat.six.moves.urllib.parse import quote as urlquote, urlparse
-from ansible.compat.six.moves.urllib.error import HTTPError
-
 from ansible.errors import AnsibleError, AnsibleOptionsError
+from ansible.module_utils.six.moves.urllib.parse import quote as urlquote, urlparse
+from ansible.module_utils.six.moves.urllib.error import HTTPError
 from ansible.module_utils.urls import open_url
 from ansible.utils.color import stringc
 
@@ -38,6 +37,7 @@ except ImportError:
     from ansible.utils.display import Display
     display = Display()
 
+
 class GalaxyLogin(object):
     ''' Class to handle authenticating user with Galaxy API prior to performing CUD operations '''