summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshio Kuratomi <a.badger@gmail.com>2016-11-01 12:46:03 -0700
committerToshio Kuratomi <a.badger@gmail.com>2016-11-01 12:46:03 -0700
commit394dd2be049dbd45af80c246993fed6162578208 (patch)
tree43d8e5133ed6c2f0f8471cde3ea7ac73a33b751b
parent0bb04e132a1d144d8d608fc0e201c426e5aa21a0 (diff)
downloadansible-394dd2be049dbd45af80c246993fed6162578208.tar.gz
Revert "fix iteritems for python 3"
This reverts commit 0bb04e132a1d144d8d608fc0e201c426e5aa21a0. This was supposed to land on stable-2.2, not stable-2.1
-rw-r--r--lib/ansible/module_utils/cloudstack.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ansible/module_utils/cloudstack.py b/lib/ansible/module_utils/cloudstack.py
index 4035e8a86d..70d4acc81e 100644
--- a/lib/ansible/module_utils/cloudstack.py
+++ b/lib/ansible/module_utils/cloudstack.py
@@ -28,7 +28,6 @@
# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import time
-from ansible.module_utils.six import iteritems
try:
from cs import CloudStack, CloudStackException, read_config