Merge pull request #10693 from momandine/import_fixes

Import fixes

v2/ansible/plugins/connections/winrm.py

@@ -24,7 +24,8 @@ import os
 import re
 import shlex
 import traceback
-import urlparse
+
+from six.moves.urllib import parse as urlparse
 from ansible import errors
 from ansible import utils
 from ansible.callbacks import vvv, vvvv, verbose

v2/ansible/plugins/strategies/__init__.py

@@ -19,7 +19,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-import Queue
+from six.moves import queue as Queue
 import time
 
 from ansible.errors import *