mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 14:25:26 +00:00
Code Issues Releases Wiki Activity

python: Use enumerate() builtin function to simplify counted iteration.

Browse Source 
Suggested-by: Reid Price <reid@nicira.com>
This commit is contained in:
Ben Pfaff
2011-08-23 14:43:54 -07:00
parent 8ba31bf16d
commit 367da73833
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
python/ovs/db/data.py
View File

@@ -348,11 +348,9 @@ class Datum(object):
if head:
s.append(head)
i = 0
for key in sorted(self.values):
for i, key in enumerate(sorted(self.values)):
if i:
s.append(", ")
i += 1
s.append(key.to_string())
if self.type.is_map():
@@ -412,18 +410,14 @@ class Datum(object):
s += ["%s->keys = xmalloc(%d * sizeof *%s->keys);"
% (var, len(self.values), var)]
i = 0
for key, value in sorted(self.values.items()):
for i, key in enumerate(sorted(self.values)):
s += key.cInitAtom("%s->keys[%d]" % (var, i))
i += 1
if self.type.value:
s += ["%s->values = xmalloc(%d * sizeof *%s->values);"
% (var, len(self.values), var)]
i = 0
for key, value in sorted(self.values.items()):
for i, (key, value) in enumerate(sorted(self.values.items())):
s += value.cInitAtom("%s->values[%d]" % (var, i))
i += 1
else:
s += ["%s->values = NULL;" % var]

8
python/ovs/json.py
View File

@@ -51,22 +51,18 @@ def to_stream(obj, stream, pretty=False, sort_keys=True):
items = sorted(obj.items())
else:
items = obj.iteritems()
i = 0
for key, value in items:
for i, (key, value) in enumerate(items):
if i > 0:
stream.write(u",")
i += 1
__dump_string(stream, unicode(key))
stream.write(u":")
to_stream(value, stream, pretty, sort_keys)
stream.write(u"}")
elif type(obj) in (list, tuple):
stream.write(u"[")
i = 0
for value in obj:
for i, value in enumerate(obj):
if i > 0:
stream.write(u",")
i += 1
to_stream(value, stream, pretty, sort_keys)
stream.write(u"]")
else: