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

[nepi.git] / src / nepi / resources / omf / channel.py

diff --git a/src/nepi/resources/omf/channel.py b/src/nepi/resources/omf/channel.py
index e3e42cd..bac1119 100644 (file)
--- a/src/nepi/resources/omf/channel.py
+++ b/src/nepi/resources/omf/channel.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
@@ -40,8 +39,8 @@ class OMFChannel(OMFResource):
         :type creds: dict
 
     """
-    _rtype = "OMFChannel"
-    _authorized_connections = ["OMFWifiInterface", "OMFNode"]
+    _rtype = "omf::Channel"
+    _authorized_connections = ["omf::WifiInterface", "omf::Node"]
 
     ChannelToFreq = dict({
              "1" : "2412",
@@ -126,7 +125,7 @@ class OMFChannel(OMFResource):
             rm_iface = self.ec.get_resource(elt)
             for conn in rm_iface.connections:
                 rm_node = self.ec.get_resource(conn)
-                if rm_node.get_rtype() == "OMFNode" and rm_node.get('hostname'):
+                if rm_node.get_rtype() == "omf::Node" and rm_node.get('hostname'):
                     if rm_iface.state < ResourceState.PROVISIONED or \
                             rm_node.state < ResourceState.READY:
                         return "reschedule"
@@ -154,7 +153,7 @@ class OMFChannel(OMFResource):
         if not self.get('channel'):
             msg = "Channel's value is not initialized"
             self.error(msg)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         if self.get('version') == "6":
             self.frequency = self.get_frequency(self.get('channel'))
@@ -164,7 +163,7 @@ class OMFChannel(OMFResource):
         if not self.get('xmppServer'):
             msg = "XmppServer is not initialzed. XMPP Connections impossible"
             self.error(msg)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         if not (self.get('xmppUser') or self.get('xmppPort') 
                    or self.get('xmppPassword')):