applied the except and raise fixers to the master branch to close the gap with py3

[nepi.git] / src / nepi / resources / linux / traceroute.py

diff --git a/src/nepi/resources/linux/traceroute.py b/src/nepi/resources/linux/traceroute.py
index 0da90a2..b9cdf99 100644 (file)
--- a/src/nepi/resources/linux/traceroute.py
+++ b/src/nepi/resources/linux/traceroute.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
@@ -18,7 +17,7 @@
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
 from nepi.execution.attribute import Attribute, Flags, Types
-from nepi.execution.resource import clsinit_copy 
+from nepi.execution.resource import clsinit_copy, ResourceState 
 from nepi.resources.linux.application import LinuxApplication
 from nepi.util.timefuncs import tnow
 
@@ -27,7 +26,7 @@ import socket
 
 @clsinit_copy
 class LinuxTraceroute(LinuxApplication):
-    _rtype = "LinuxTraceroute"
+    _rtype = "linux::Traceroute"
 
     @classmethod
     def _register_attributes(cls):
@@ -96,7 +95,7 @@ class LinuxTraceroute(LinuxApplication):
             else:
                 msg = " Failed to execute command '%s'" % command
                 self.error(msg, out, err)
-                raise RuntimeError, msg
+                raise RuntimeError(msg)
         else:
            super(LinuxTraceroute, self).do_start()