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

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

diff --git a/src/nepi/resources/linux/tunnel.py b/src/nepi/resources/linux/tunnel.py
index b2a6f0f..1bb587d 100644 (file)
--- a/src/nepi/resources/linux/tunnel.py
+++ b/src/nepi/resources/linux/tunnel.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
@@ -65,7 +64,7 @@ class LinuxTunnel(LinuxApplication):
         return os.path.join(self.app_home(endpoint), self.ec.run_id)
 
     def endpoint_mkdir(self, endpoint):
-        self.endpoint.node.mkdir(self.run_home(self.endpoint))
+        endpoint.node.mkdir(self.run_home(endpoint))
 
     def initiate_connection(self, endpoint, remote_endpoint):
         raise NotImplementedError
@@ -130,7 +129,7 @@ class LinuxTunnel(LinuxApplication):
         else:
             msg = " Failed to execute command '%s'" % command
             self.error(msg, out, err)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
     def do_stop(self):
         """ Stops application execution