Lda: replace assert with direct exception raising

fallen · sbourdeauducq · commit 5cfdac9c7c65 · 2015-02-20T10:21:15.000-07:00
diff --git a/artiq/devices/lda/driver.py b/artiq/devices/lda/driver.py
@@ -156,7 +156,8 @@ def write(self, command, length, data=bytes()):
         buf = struct.pack("BBB6s", 0, command, length, data)
         res = self._check_error(self.hidapi.hid_write(self._dev, buf,
                                                       len(buf)))
-        assert res == len(buf), res
+        if res != len(buf):
+            raise IOError
 
     def set(self, command, data):
         """Sends a SET command to the Lab Brick device.
@@ -165,8 +166,10 @@ def set(self, command, data):
         :param data: payload of the command.
         """
 
-        assert command & 0x80
-        assert data
+        if not data:
+            raise ValueError("Data is empty")
+        if not (command & 0x80):
+            raise ValueError("Set commands must have most significant bit set")
         self.write(command, len(data), data)
 
     def get(self, command, length, timeout=1000):
@@ -179,14 +182,17 @@ def get(self, command, length, timeout=1000):
         :rtype: bytes
         """
 
-        assert not command & 0x80
+        if command & 0x80:
+            raise ValueError("Get commands must not have most significant bit"
+                             " set")
         status = None
         self.write(command, length)
         buf = ctypes.create_string_buffer(8)
         while status != command:
             res = self._check_error(self.hidapi.hid_read_timeout(self._dev,
                                     buf, len(buf), timeout))
-            assert res == len(buf), res
+            if res != len(buf):
+                raise IOError
             status, length, data = struct.unpack("BB6s", buf.raw)
             data = data[:length]
         logger.info("%s %s %r", command, length, data)
