Don't return anything at all, just exit.

More Pythonic.

Author: rshipp

nut2.py

@@ -280,32 +280,20 @@ def set_var(self, ups="", var="", value=""):
 
         self._srv_handler.write("SET VAR %s %s %s\n" % (ups, var, value))
         result = self._srv_handler.read_until("\n")
-        if result == "OK\n":
-            return True
-        else:
-            raise PyNUTError(result)
+        if result != "OK\n":
+            raise PyNUTError(result.replace("\n", ""))
 
     def run_command(self, ups="", command=""):
-        """Send a command to the specified UPS.
-
-        Returns OK on success or raises an error.
-        """
-
+        """Send a command to the specified UPS."""
         logging.debug("run_command called...")
 
         self._srv_handler.write("INSTCMD %s %s\n" % (ups, command))
         result = self._srv_handler.read_until("\n")
-        if result == "OK\n":
-            return True
-        else:
+        if result != "OK\n":
             raise PyNUTError(result.replace("\n", ""))
 
     def fsd(self, ups=""):
-        """Send FSD command.
-
-        Returns OK on success or raises an error.
-        """
-
+        """Send FSD command."""
         logging.debug("MASTER called...")
 
         self._srv_handler.write("MASTER %s\n" % ups)
@@ -316,22 +304,18 @@ def fsd(self, ups=""):
         logging.debug("FSD called...")
         self._srv_handler.write("FSD %s\n" % ups)
         result = self._srv_handler.read_until("\n")
-        if result == "OK FSD-SET\n":
-            return True
-        else:
+        if result != "OK FSD-SET\n":
             raise PyNUTError(result.replace("\n", ""))
 
     def help(self):
         """Send HELP command."""
-
         logging.debug("HELP called...")
 
         self._srv_handler.write("HELP\n")
         return self._srv_handler.read_until("\n")
 
     def ver(self):
         """Send VER command."""
-
         logging.debug("VER called...")
 
         self._srv_handler.write("VER\n")

tests/testclient.py

@@ -118,7 +118,10 @@ def test_get_rw_vars_invalid_ups(self):
         self.assertRaises(PyNUTError, self.client.list_rw_vars, self.invalid)
 
     def test_set_rw_var_valid(self):
-        assert(self.client.set_var(self.valid, self.valid, self.valid))
+        try:
+            self.client.set_var(self.valid, self.valid, self.valid)
+        except PyNUTError:
+            assert(False)
 
     def test_set_rw_var_invalid(self):
         self.assertRaises(PyNUTError, self.client.set_var, self.invalid,
@@ -129,7 +132,10 @@ def test_set_rw_var_broken(self):
                 self.valid, self.valid)
 
     def test_run_ups_command_valid(self):
-        assert(self.client.run_command(self.valid, self.valid))
+        try:
+            self.client.run_command(self.valid, self.valid)
+        except PyNUTError:
+            assert(False)
 
     def test_run_ups_command_invalid(self):
         self.assertRaises(PyNUTError, self.client.run_command, self.invalid,
@@ -140,7 +146,10 @@ def test_run_ups_command_broken(self):
                     self.valid)
 
     def test_fsd_valid_ups(self):
-        assert(self.client.fsd(self.valid))
+        try:
+            self.client.fsd(self.valid)
+        except PyNUTError:
+            assert(False)
 
     def test_fsd_invalid_ups(self):
         self.assertRaises(PyNUTError, self.client.fsd, self.invalid)