iteritems => items

conduct.py

@@ -79,7 +79,7 @@ def addChainArgs(parser, chainName):
     '''
     chainDef = loadChainDefinition(chainName)
 
-    for paramName, paramDef in chainDef['parameters'].iteritems():
+    for paramName, paramDef in chainDef['parameters'].items():
         flag = '--%s' % paramName
         parser.add_argument(
             flag,

conduct/chain.py

@@ -61,7 +61,7 @@ def _initLogger(self):
         self.log = conduct.log.getChild(self.name, True)
 
     def _applyParamValues(self, values):
-        for name, definition in self.parameters.iteritems():
+        for name, definition in self.parameters.items():
             if name in values:
                 self.params[name] = values[name]
             elif definition.default is not None:
@@ -76,7 +76,7 @@ def _loadChainDefinition(self):
         self._createSteps()
 
     def _createSteps(self):
-        for name, definition in self._chainDef['steps'].iteritems():
+        for name, definition in self._chainDef['steps'].items():
             # name should be step:name or chain:name
             entryType, entryName = definition[0].split(':')
 
@@ -93,7 +93,7 @@ def _createSteps(self):
                 self.steps[name] = Chain(entryName)
 
     def _createReferencers(self, paramValues):
-        for paramName, paramValue in paramValues.iteritems():
+        for paramName, paramValue in paramValues.items():
             if isinstance(paramValue, str) \
                 and re.match('.*?(\{(.*?)\})+.*?', paramValue):
                     paramValues[paramName] = Referencer(paramValue)

conduct/loggers.py

@@ -40,7 +40,7 @@
 SECONDS_PER_DAY = 60 * 60 * 24
 
 LOGLEVELS = {'debug': DEBUG, 'info': INFO, 'warning': WARNING, 'error': ERROR}
-INVLOGLEVELS = {value : key for key, value in LOGLEVELS.iteritems()}
+INVLOGLEVELS = {value : key for key, value in LOGLEVELS.items()}
 
 class ConductLogger(Logger):
     def getChild(self, suffix, ownDir=False):

conduct/param.py

@@ -129,7 +129,7 @@ def __call__(self, val=None):
         if not isinstance(val, dict):
             raise ValueError('value needs to be a dict')
         ret = {}
-        for k, v in val.iteritems():
+        for k, v in val.items():
             ret[self.keyconv(k)] = self.valconv(v)
         return ret
 

doc/ext/paramdoc.py

@@ -94,7 +94,7 @@ def document_members(self, all_members=False):
 
         if isinstance(self.object.parameters, property):
             return ClassDocumenter.document_members(self, all_members)
-        for param, info in sorted(self.object.parameters.iteritems()):
+        for param, info in sorted(self.object.parameters.items()):
             if info.classname is not None and info.classname != myclsname:
                 baseparaminfo.append((param, info))
                 continue