use print() - import print_function - should be fine for both py2 and py3

[nepi.git] / src / nepi / resources / planetlab / scripts / pl-vif-down.py

diff --git a/src/nepi/resources/planetlab/scripts/pl-vif-down.py b/src/nepi/resources/planetlab/scripts/pl-vif-down.py
index caac65a..f766a37 100644 (file)
--- a/src/nepi/resources/planetlab/scripts/pl-vif-down.py
+++ b/src/nepi/resources/planetlab/scripts/pl-vif-down.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 socket
 import vsys
@@ -70,13 +71,15 @@ if __name__ == '__main__':
     # If a socket name is sent, send the STOP message and wait for a reply
     if socket_name:
         sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-        sock.connect(socket_name)
-        encoded = base64.b64encode(STOP_MSG)
-        sock.send("%s\n" % encoded)
-        reply = sock.recv(1024)
-        reply = base64.b64decode(reply)
-        print reply
-
+        try:
+            sock.connect(socket_name)
+            encoded = base64.b64encode(STOP_MSG)
+            sock.send("%s\n" % encoded)
+            reply = sock.recv(1024)
+            reply = base64.b64decode(reply)
+            print(reply)
+        except:
+            print("Did not properly shutdown device")
     # If a slicename is provided, use it to remove a GRE device
     elif slicename:
         import pwd