Fix Python 3 compatability issues.

New raise syntax.

Author: rshipp

nut2.py

@@ -102,13 +102,13 @@ def __connect( self ) :
             self._srv_handler.write( "USERNAME %s\n" % self.__login )
             result = self._srv_handler.read_until( "\n", self.__timeout )
             if result[:2] != "OK" :
-                raise Exception, result.replace( "\n", "" )
+                raise Exception(result.replace( "\n", "" ))
 
         if self.__password != None :
             self._srv_handler.write( "PASSWORD %s\n" % self.__password )
             result = self._srv_handler.read_until( "\n", self.__timeout )
             if result[:2] != "OK" :
-                raise Exception, result.replace( "\n", "" )
+                raise Exception(result.replace( "\n", "" ))
 
     def GetUPSList( self ) :
         """ Returns the list of available UPS from the NUT server
@@ -121,7 +121,7 @@ def GetUPSList( self ) :
         self._srv_handler.write( "LIST UPS\n" )
         result = self._srv_handler.read_until( "\n" )
         if result != "BEGIN LIST UPS\n" :
-            raise Exception, result.replace( "\n", "" )
+            raise Exception(result.replace( "\n", "" ))
 
         result = self._srv_handler.read_until( "END LIST UPS\n" )
         ups_list = {}
@@ -145,7 +145,7 @@ def GetUPSVars( self, ups="" ) :
         self._srv_handler.write( "LIST VAR %s\n" % ups )
         result = self._srv_handler.read_until( "\n" )
         if result != "BEGIN LIST VAR %s\n" % ups :
-            raise Exception, result.replace( "\n", "" )
+            raise Exception(result.replace( "\n", "" ))
 
         ups_vars   = {}
         result     = self._srv_handler.read_until( "END LIST VAR %s\n" % ups )
@@ -171,7 +171,7 @@ def GetUPSCommands( self, ups="" ) :
         self._srv_handler.write( "LIST CMD %s\n" % ups )
         result = self._srv_handler.read_until( "\n" )
         if result != "BEGIN LIST CMD %s\n" % ups :
-            raise Exception, result.replace( "\n", "" )
+            raise Exception(result.replace( "\n", "" ))
 
         ups_cmds   = {}
         result     = self._srv_handler.read_until( "END LIST CMD %s\n" % ups )
@@ -208,7 +208,7 @@ def GetRWVars( self,  ups="" ) :
         self._srv_handler.write( "LIST RW %s\n" % ups )
         result = self._srv_handler.read_until( "\n" )
         if ( result != "BEGIN LIST RW %s\n" % ups ) :
-            raise Exception,  result.replace( "\n",  "" )
+            raise Exception( result.replace( "\n",  "" ))
 
         result     = self._srv_handler.read_until( "END LIST RW %s\n" % ups )
         offset     = len( "VAR %s" % ups )
@@ -238,7 +238,7 @@ def SetRWVar( self, ups="", var="", value="" ):
         if ( result == "OK\n" ) :
             return( "OK" )
         else :
-            raise Exception, result
+            raise Exception(result)
 
     def RunUPSCommand( self, ups="", command="" ) :
         """ Send a command to the specified UPS
@@ -254,7 +254,7 @@ def RunUPSCommand( self, ups="", command="" ) :
         if ( result == "OK\n" ) :
             return( "OK" )
         else :
-            raise Exception, result.replace( "\n", "" )
+            raise Exception(result.replace( "\n", "" ))
 
     def FSD( self, ups="") :
         """ Send FSD command
@@ -268,7 +268,7 @@ def FSD( self, ups="") :
         self._srv_handler.write( "MASTER %s\n" % ups )
         result = self._srv_handler.read_until( "\n" )
         if ( result != "OK MASTER-GRANTED\n" ) :
-            raise Exception, ( "Master level function are not available", "" )
+            raise Exception(( "Master level function are not available", "" ))
 
         if self.__debug :
             print( "[DEBUG] FSD called..." )
@@ -277,7 +277,7 @@ def FSD( self, ups="") :
         if ( result == "OK FSD-SET\n" ) :
             return( "OK" )
         else :
-            raise Exception, result.replace( "\n", "" )
+            raise Exception(result.replace( "\n", "" ))
 
     def help(self) :
         """ Send HELP command
@@ -308,15 +308,15 @@ def ListClients( self, ups = None ) :
             print( "[DEBUG] ListClients from server" )
 
         if ups and (ups not in self.GetUPSList()):
-            raise Exception, "%s is not a valid UPS" % ups
+            raise Exception("%s is not a valid UPS" % ups)
 
         if ups:
             self._srv_handler.write( "LIST CLIENTS %s\n" % ups)
         else:
             self._srv_handler.write( "LIST CLIENTS\n" )
         result = self._srv_handler.read_until( "\n" )
         if result != "BEGIN LIST CLIENTS\n" :
-            raise Exception, result.replace( "\n", "" )
+            raise Exception(result.replace( "\n", "" ))
 
         result = self._srv_handler.read_until( "END LIST CLIENTS\n" )
         ups_list = {}