From 08feaea077e2aebe3cef0d9d2cf4e2e28f6068f2 Mon Sep 17 00:00:00 2001 From: Amandine Lee Date: Mon, 13 Apr 2015 14:03:10 -0700 Subject: [PATCH 1/2] Fix plugin imports with six --- v2/ansible/plugins/connections/winrm.py | 3 ++- v2/ansible/plugins/strategies/__init__.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/v2/ansible/plugins/connections/winrm.py b/v2/ansible/plugins/connections/winrm.py index f94141b81b6..f3d6a03ba07 100644 --- a/v2/ansible/plugins/connections/winrm.py +++ b/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 diff --git a/v2/ansible/plugins/strategies/__init__.py b/v2/ansible/plugins/strategies/__init__.py index c5b3dd0f066..3f160d84dbc 100644 --- a/v2/ansible/plugins/strategies/__init__.py +++ b/v2/ansible/plugins/strategies/__init__.py @@ -19,7 +19,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -import Queue +import six.moves import queue as Queue import time from ansible.errors import * From 164cfdfda4780973272b9cc63dcf376a36317b0e Mon Sep 17 00:00:00 2001 From: Amandine Lee Date: Mon, 13 Apr 2015 14:28:00 -0700 Subject: [PATCH 2/2] Fix typo --- v2/ansible/plugins/strategies/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2/ansible/plugins/strategies/__init__.py b/v2/ansible/plugins/strategies/__init__.py index 3f160d84dbc..9b26ff23a7f 100644 --- a/v2/ansible/plugins/strategies/__init__.py +++ b/v2/ansible/plugins/strategies/__init__.py @@ -19,7 +19,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -import six.moves import queue as Queue +from six.moves import queue as Queue import time from ansible.errors import *