git://git.onelab.eu
/
pyplnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
context managers
[pyplnet.git]
/
sioc.py
diff --git
a/sioc.py
b/sioc.py
index
489a93e
..
f887245
100644
(file)
--- a/
sioc.py
+++ b/
sioc.py
@@
-1,4
+1,3
@@
-# $Id$
# vim:set ts=4 sw=4 expandtab:
# (c) Copyright 2008 The Trustees of Princeton University
# vim:set ts=4 sw=4 expandtab:
# (c) Copyright 2008 The Trustees of Princeton University
@@
-39,20
+38,13
@@
def gifconf():
stdin=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, close_fds=True)
(stdout, stderr) = ip.communicate()
stdin=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, close_fds=True)
(stdout, stderr) = ip.communicate()
- ip.wait()
+ # no wait is needed when using communicate
for line in stdout.split("\n"):
for line in stdout.split("\n"):
- line = line.strip()
- if line =='':continue
-
- fields = line.split(" ")
- # clean up fields
- for i in range(0,len(fields)): fields[i]=fields[i].strip()
-
- if fields[0] == "inet":
+ fields = [ field.strip() for field in line.split() ]
+ if fields and fields[0] == "inet":
# fields[-1] is the last column in fields, which has the interface name
# fields[-1] is the last column in fields, which has the interface name
- # fields[1] has the IP address
+ # fields[1] has the IP address
/ netmask width
ret[fields[-1]] = fields[1].split("/")[0]
ret[fields[-1]] = fields[1].split("/")[0]
-
return ret
def gifhwaddr(interface):
return ret
def gifhwaddr(interface):