From: Thierry Parmentelat Date: Wed, 6 Apr 2011 08:22:03 +0000 (+0200) Subject: use iteritems in loops on dicts X-Git-Tag: sfa-1.0-21-ckp1~74^2~28 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=fdb8b5b2340477f3a55152f8d28ad2e050b0035d use iteritems in loops on dicts --- diff --git a/sfa/client/getNodes.py b/sfa/client/getNodes.py index b87fa407..67f9a28d 100644 --- a/sfa/client/getNodes.py +++ b/sfa/client/getNodes.py @@ -32,7 +32,7 @@ def print_dict(rdict, options, counter=1): if not isinstance(rdict, dict): raise "%s not a dict" % rdict - for (key, value) in rdict.items(): + for (key, value) in rdict.iteritems(): if isinstance(value, StringTypes): if (attributes and key in attributes) or not attributes: print tab * counter + "%s: %s" % (key, value) diff --git a/sfa/client/sfascan.py b/sfa/client/sfascan.py index 97457e33..f85384dc 100755 --- a/sfa/client/sfascan.py +++ b/sfa/client/sfascan.py @@ -173,7 +173,7 @@ class SfaScan: # 'peers' is needed as well as AMs typically don't have peers if 'geni_api' in version and 'peers' in version: # proceed with neighbours - for (next_name,next_url) in version['peers'].items(): + for (next_name,next_url) in version['peers'].iteritems(): next_interface=Interface(next_url) # locate or create node in graph try: @@ -192,7 +192,7 @@ class SfaScan: for node in graph.nodes(): interface=node2interface.get(node,None) if interface: - for (k,v) in interface.get_layout().items(): + for (k,v) in interface.get_layout().iteritems(): node.attr[k]=v else: sfa_logger().error("MISSED interface with node %s"%node) diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index a70590b5..7f072d72 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -781,7 +781,7 @@ class Sfi: else: server = self.get_server_from_opts(opts) version=server.GetVersion() - for (k,v) in version.items(): + for (k,v) in version.iteritems(): print "%-20s: %s"%(k,v) # list instantiated slices diff --git a/sfa/managers/registry_manager_pl.py b/sfa/managers/registry_manager_pl.py index 8df08918..dc364b3e 100644 --- a/sfa/managers/registry_manager_pl.py +++ b/sfa/managers/registry_manager_pl.py @@ -17,7 +17,7 @@ from sfa.managers.aggregate_manager_pl import slice_status # The GENI GetVersion call def GetVersion(api): - peers =dict ([ (peername,v._ServerProxy__host) for (peername,v) in api.registries.items() + peers =dict ([ (peername,v._ServerProxy__host) for (peername,v) in api.registries.iteritems() if peername != api.hrn]) xrn=Xrn(api.hrn) return version_core({'interface':'registry', diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py index cc1ae4b3..a814106a 100644 --- a/sfa/managers/slice_manager_pl.py +++ b/sfa/managers/slice_manager_pl.py @@ -39,7 +39,7 @@ def get_serverproxy_url (server): def GetVersion(api): # peers explicitly in aggregates.xml - peers =dict ([ (peername,get_serverproxy_url(v)) for (peername,v) in api.aggregates.items() + peers =dict ([ (peername,get_serverproxy_url(v)) for (peername,v) in api.aggregates.iteritems() if peername != api.hrn]) xrn=Xrn (api.hrn) sm_version=version_core({'interface':'slicemgr', @@ -140,7 +140,7 @@ def get_ticket(api, xrn, creds, rspec, users): if not credential: credential = api.getCredential() threads = ThreadManager() - for aggregate, aggregate_rspec in aggregate_rspecs.items(): + for (aggregate, aggregate_rspec) in aggregate_rspecs.iteritems(): # prevent infinite loop. Dont send request back to caller # unless the caller is the aggregate's SM if caller_hrn == aggregate and aggregate != api.hrn: diff --git a/sfa/server/modpythonapi/BaseApi.py b/sfa/server/modpythonapi/BaseApi.py index 26d9c496..f82b055e 100755 --- a/sfa/server/modpythonapi/BaseApi.py +++ b/sfa/server/modpythonapi/BaseApi.py @@ -83,7 +83,7 @@ def xmlrpclib_dump(self, value, write): f = self.dispatch[type(value)] except KeyError: # Try for an isinstance() match - for Type, f in self.dispatch.iteritems(): + for (Type, f) in self.dispatch.iteritems(): if isinstance(value, Type): f(*args) return diff --git a/sfa/util/row.py b/sfa/util/row.py index 7334fccd..129f5147 100644 --- a/sfa/util/row.py +++ b/sfa/util/row.py @@ -28,7 +28,7 @@ class Row(dict): # raise SfaInvalidArgument, field + " must be specified and cannot be unset in class %s"%self.__class__.__name__ # Validate values before committing - for key, value in self.iteritems(): + for (key, value) in self.iteritems(): if value is not None and hasattr(self, 'validate_' + key): validate = getattr(self, 'validate_' + key) self[key] = validate(value) diff --git a/sfa/util/sfalogging.py b/sfa/util/sfalogging.py index 422ef461..42e2e678 100755 --- a/sfa/util/sfalogging.py +++ b/sfa/util/sfalogging.py @@ -129,7 +129,7 @@ def profile(logger): result = callable(*args, **kwds) end = time.time() args = map(str, args) - args += ["%s = %s" % (name, str(value)) for (name, value) in kwds.items()] + args += ["%s = %s" % (name, str(value)) for (name, value) in kwds.iteritems()] # should probably use debug, but then debug is not always enabled logger.info("PROFILED %s (%s): %.02f s" % (callable.__name__, ", ".join(args), end - start)) return result diff --git a/sfa/util/table.py b/sfa/util/table.py index 1b43a339..0e162897 100644 --- a/sfa/util/table.py +++ b/sfa/util/table.py @@ -35,7 +35,7 @@ class SfaTable(list): def db_fields(self, obj=None): db_fields = self.db.fields(self.SFA_TABLE_PREFIX) - return dict( [ (key,value) for (key, value) in obj.items() \ + return dict( [ (key,value) for (key, value) in obj.iteritems() \ if key in db_fields and self.is_writable(key, value, SfaRecord.fields)] ) @@ -98,7 +98,7 @@ class SfaTable(list): def insert(self, record): db_fields = self.db_fields(record) keys = db_fields.keys() - values = [self.db.param(key, value) for (key, value) in db_fields.items()] + values = [self.db.param(key, value) for (key, value) in db_fields.iteritems()] query_str = "INSERT INTO " + self.tablename + \ "(" + ",".join(keys) + ") " + \ "VALUES(" + ",".join(values) + ")" @@ -117,7 +117,7 @@ class SfaTable(list): def update(self, record): db_fields = self.db_fields(record) keys = db_fields.keys() - values = [self.db.param(key, value) for (key, value) in db_fields.items()] + values = [self.db.param(key, value) for (key, value) in db_fields.iteritems()] columns = ["%s = %s" % (key, value) for (key, value) in zip(keys, values)] query_str = "UPDATE %s SET %s WHERE record_id = %s" % \ (self.tablename, ", ".join(columns), record['record_id'])