Signed-off-by: Gurucharan Shetty <g...@ovn.org>
---
utilities/bugtool/ovs-bugtool.in | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in
index cd1924d..95ea482 100755
--- a/utilities/bugtool/ovs-bugtool.in
+++ b/utilities/bugtool/ovs-bugtool.in
@@ -332,14 +332,14 @@ def collect_data():
for (k, v) in data.items():
cap = v['cap']
- if v.has_key('cmd_args'):
+ if 'cmd_args' in v:
v['output'] = StringIOmtime()
- if not process_lists.has_key(cap):
+ if not cap in process_lists:
process_lists[cap] = []
process_lists[cap].append(
ProcOutput(v['cmd_args'], caps[cap][MAX_TIME], v['output'],
v['filter'], v['binary']))
- elif v.has_key('filename') and v['filename'].startswith('/proc/'):
+ elif 'filename' in v and v['filename'].startswith('/proc/'):
# proc files must be read into memory
try:
f = open(v['filename'], 'r')
@@ -349,7 +349,7 @@ def collect_data():
v['output'] = StringIOmtime(s)
except:
pass
- elif v.has_key('func'):
+ elif 'func' in v:
try:
s = v['func'](cap)
except Exception, e:
@@ -873,7 +873,7 @@ def load_plugins(just_capabilities=False, filter=None):
for dir in [d for d in os.listdir(PLUGIN_DIR)
if os.path.isdir(os.path.join(PLUGIN_DIR, d))]:
- if not caps.has_key(dir):
+ if not dir in caps:
if not os.path.exists("%s/%s.xml" % (PLUGIN_DIR, dir)):
continue
xmldoc = parse("%s/%s.xml" % (PLUGIN_DIR, dir))
@@ -982,12 +982,12 @@ def make_tar(subdir, suffix, output_fd, output_file):
ti.uname = 'root'
ti.gname = 'root'
- if v.has_key('output'):
+ if 'output' in v:
ti.mtime = v['output'].mtime
ti.size = len(v['output'].getvalue())
v['output'].seek(0)
tf.addfile(ti, v['output'])
- elif v.has_key('filename'):
+ elif 'filename' in v:
s = os.stat(v['filename'])
ti.mtime = s.st_mtime
ti.size = s.st_size
@@ -1019,7 +1019,7 @@ def make_zip(subdir, output_file):
try:
dest = os.path.join(subdir, construct_filename(k, v))
- if v.has_key('output'):
+ if 'output' in v:
zf.writestr(dest, v['output'].getvalue())
else:
if os.stat(v['filename']).st_size < 50:
@@ -1071,20 +1071,20 @@ def inventory_entry(document, subdir, k, v):
def md5sum(d):
m = md5.new()
- if d.has_key('filename'):
+ if 'filename' in d:
f = open(d['filename'])
data = f.read(1024)
while len(data) > 0:
m.update(data)
data = f.read(1024)
f.close()
- elif d.has_key('output'):
+ elif 'output' in d:
m.update(d['output'].getvalue())
return m.hexdigest()
def construct_filename(k, v):
- if v.has_key('filename'):
+ if 'filename' in v:
if v['filename'][0] == '/':
return v['filename'][1:]
else:
--
1.9.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
