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 7b2a8e0..6b72278 100644 (file)
--- a/src/nepi/resources/planetlab/scripts/pl-vif-create.py
+++ b/src/nepi/resources/planetlab/scripts/pl-vif-create.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,6 +16,8 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
+from __future__ import print_function
+
 import base64
 import errno
 import passfd
@@ -39,7 +40,7 @@ def recv_msg(conn):
     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
@@ -77,7 +78,7 @@ def passfd_action(fd, args):
     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')
@@ -118,11 +119,11 @@ def get_options():
 
     parser.add_option("-f", "--vif-name-file", dest="vif_name_file",
         help = "File to store the virtual interface name assigned by the OS", 
-        default = "if_name", type="str")
+        default = "vif_name", type="str")
 
     parser.add_option("-S", "--socket-name", dest="socket_name",
         help = "Name for the unix socket used to interact with this process", 
-        default = "tap.sock", type="str")
+        type="str")
 
     (options, args) = parser.parse_args()
     
@@ -144,10 +145,9 @@ if __name__ == '__main__':
     vsys.vif_up(vif_name, ip4_address, net_prefix, snat = snat, 
             pointopoint = pointopoint, txqueuelen = txqueuelen) 
      
-    # Saving interface name to 'if_name_file
-    f = open(vif_name_file, 'w')
-    f.write(vif_name)
-    f.close()
+    # Saving interface name to vif_name_file
+    with open(vif_name_file, 'w') as f:
+        f.write(vif_name)
 
     # create unix socket to receive instructions
     sock = create_socket(socket_name)
@@ -163,7 +163,7 @@ if __name__ == '__main__':
         while not stop:
             try:
                 (msg, args) = recv_msg(conn)
-            except socket.timeout, e:
+            except socket.timeout as e:
                 # Ingore time-out
                 continue