Merge "Replace six.iteritems() with .items()"

fuelmenu/common/modulehelper.py

@@ -98,7 +98,7 @@ class ModuleHelper(object):
         """
         # Read in yaml
         types_to_skip = (WidgetType.BUTTON, WidgetType.LABEL)
-        for setting, setting_def in six.iteritems(defaults):
+        for setting, setting_def in defaults.items():
             if (setting_def.get('type') in types_to_skip or
                ignoredparams and setting in ignoredparams):
                     continue

fuelmenu/common/puppet.py

@@ -13,7 +13,6 @@
 # under the License.
 
 import logging
-import six
 
 from fuelmenu.common import utils
 from fuelmenu import consts
@@ -56,7 +55,7 @@ def puppetApply(classes):
             continue
 
         # Build params
-        for key, value in six.iteritems(cls["params"]):
+        for key, value in cls["params"].items():
             cmd_input.extend([key, "=>", _to_string(value)])
         cmd_input.append('}')
 

fuelmenu/modules/bootstrapimg.py

@@ -19,7 +19,6 @@ import requests
 import types
 import urlparse
 
-import six
 import urwid
 import urwid.raw_display
 import urwid.web_display
@@ -213,7 +212,7 @@ class BootstrapImage(urwid.WidgetWrap):
 
         # on UI we have labels, but not keys...
         label_to_key_mapping = dict((v['label'], k) for k, v in
-                                    six.iteritems(self.repo_value_scheme))
+                                    self.repo_value_scheme.items())
         result = []
         for lb in external_lw:
             repo = {}

fuelmenu/modules/interfaces.py

@@ -16,7 +16,6 @@
 import logging
 import netaddr
 import re
-import six
 import socket
 import urwid
 
@@ -134,7 +133,7 @@ class Interfaces(urwid.WidgetWrap):
         errors = []
 
         # Check for the duplicate IP provided
-        for k, v in six.iteritems(self.netsettings):
+        for k, v in self.netsettings.items():
             if (k != self.activeiface and responses["ipaddr"] != ''
                     and responses["ipaddr"] == v.get('addr')):
                 errors.append("The same IP address {0} is assigned for "