git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
applied the except and raise fixers to the master branch to close the gap with py3
[nepi.git]
/
src
/
nepi
/
resources
/
planetlab
/
scripts
/
pl-vif-create.py
diff --git
a/src/nepi/resources/planetlab/scripts/pl-vif-create.py
b/src/nepi/resources/planetlab/scripts/pl-vif-create.py
index
30ca66b
..
6b72278
100644
(file)
--- a/
src/nepi/resources/planetlab/scripts/pl-vif-create.py
+++ b/
src/nepi/resources/planetlab/scripts/pl-vif-create.py
@@
-16,6
+16,8
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
+from __future__ import print_function
+
import base64
import errno
import passfd
import base64
import errno
import passfd
@@
-38,7
+40,7
@@
def recv_msg(conn):
while '\n' not in chunk:
try:
chunk = conn.recv(1024)
while '\n' not in chunk:
try:
chunk = conn.recv(1024)
- except (OSError, socket.error)
,
e:
+ except (OSError, socket.error)
as
e:
if e[0] != errno.EINTR:
raise
# Ignore eintr errors
if e[0] != errno.EINTR:
raise
# Ignore eintr errors
@@
-76,7
+78,7
@@
def passfd_action(fd, args):
to another process through a unix socket.
"""
address = args.pop(0)
to another process through a unix socket.
"""
address = args.pop(0)
- print
address
+ print
(address)
sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
sock.connect(address)
passfd.sendfd(sock, fd, '0')
sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
sock.connect(address)
passfd.sendfd(sock, fd, '0')
@@
-144,9
+146,8
@@
if __name__ == '__main__':
pointopoint = pointopoint, txqueuelen = txqueuelen)
# Saving interface name to vif_name_file
pointopoint = pointopoint, txqueuelen = txqueuelen)
# Saving interface name to vif_name_file
- f = open(vif_name_file, 'w')
- f.write(vif_name)
- f.close()
+ with open(vif_name_file, 'w') as f:
+ f.write(vif_name)
# create unix socket to receive instructions
sock = create_socket(socket_name)
# create unix socket to receive instructions
sock = create_socket(socket_name)
@@
-162,7
+163,7
@@
if __name__ == '__main__':
while not stop:
try:
(msg, args) = recv_msg(conn)
while not stop:
try:
(msg, args) = recv_msg(conn)
- except socket.timeout
,
e:
+ except socket.timeout
as
e:
# Ingore time-out
continue
# Ingore time-out
continue