cosmetic

[nepi.git] / examples / planetlab / update_fedora_repo.py

diff --git a/examples/planetlab/update_fedora_repo.py b/examples/planetlab/update_fedora_repo.py
index 623a1e1..ed26f8d 100644 (file)
--- a/examples/planetlab/update_fedora_repo.py
+++ b/examples/planetlab/update_fedora_repo.py
@@ -4,9 +4,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
@@ -28,6 +27,10 @@
 # $ cd <path-to-nepi>
 # python examples/planetlab/update_fedora_repo.py -H <host1,host2,..> -s <pl-slice> -u <pl-user> -p <pl-password> -k <pl-ssh-key>  
 
+from __future__ import print_function
+
+from six.moves import input
+
 from nepi.execution.ec import ExperimentController 
 
 from optparse import OptionParser, SUPPRESS_HELP
@@ -56,7 +59,7 @@ parser.add_option("-k", "--pl-ssh-key", dest="pl_ssh_key",
 
 (options, args) = parser.parse_args()
 
-proceed = raw_input ("Executing this script will modify the fedora yum repositories in the selected PlanetLab hosts. Are you sure to continue? [y/N] ")
+proceed = input ("Executing this script will modify the fedora yum repositories in the selected PlanetLab hosts. Are you sure to continue? [y/N] ")
 if proceed.lower() not in ['yes', 'y']:
     os._exit(1)
 
@@ -66,7 +69,7 @@ pl_user = options.pl_user
 pl_password = options.pl_password
 hosts = options.hosts
 
-hosts = map(str.strip, hosts.split(","))
+hosts = [host.strip() for host in hosts.split(",")]
 apps = []
 
 ## Create the experiment controller
@@ -133,9 +136,9 @@ ec.wait_finished(apps)
 
 for app in apps:
     try:
-        print ec.trace(app, "stderr")
+        print(ec.trace(app, "stderr"))
     except:
-        print "NO stderr"
+        print("NO stderr")
 
 ec.shutdown()