remove except: pass, bad me

psas · Jul 12, 2014 · fdaab4a · fdaab4a
1 parent 5b124c7
commit fdaab4a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 19 deletions.
diff --git a/examples/send_packets.py b/examples/send_packets.py
@@ -28,10 +28,10 @@
     }
 
     # send a whole message (with header)
-    udp.send_message(messages.ADIS, time.time(), data)
+    #udp.send_message(messages.ADIS, time.time(), data)
 
     # send just data (no header)
-    udp.send_data(messages.ADIS, data)
+    #udp.send_data(messages.ADIS, data)
 
     # send data preceded with a sequence number (0, in this case)
     udp.send_seq_data(messages.ADIS, 0, data)
diff --git a/psas_packet/network.py b/psas_packet/network.py
@@ -60,10 +60,7 @@ def send_data(self, msgtype, data):
         :param dict data: Data to get packed and sent
 
         """
-        try:
-            self.socket.send(msgtype.encode(data))
-        except:
-            pass
+        self.socket.send(msgtype.encode(data))
 
     def send_seq_data(self, msgtype, seq, data):
         """Send message with a sequence number header over a socket. Does the packing for you.
@@ -73,20 +70,15 @@ def send_seq_data(self, msgtype, seq, data):
         :param dict data: Data to get packed and sent
 
         """
-        try:
-            packed = msgtype.encode(data)
-            s = struct.pack('!L', seq)
-            self.socket.send(s + packed)
-        except:
-            pass
+        packed = msgtype.encode(data)
+        s = struct.pack('!L', seq)
+        self.socket.send(s + packed)
 
     def send_raw(self, raw):
         """Send raw bytes using this connection
 
         :param raw bytes: bytes to send
 
         """
-        try:
-            self.socket.send(raw)
-        except:
-            pass
+        self.socket.send(raw)
+
diff --git a/tests/test_examples.py b/tests/test_examples.py
@@ -14,10 +14,11 @@
 class TestExamples(unittest.TestCase):
 
     def test_send_packets(self):
+
         try:
             with open('./examples/send_packets.py', 'r') as ex:
                 exec(ex.read())
-        except ExceptionType:
+        except:
             self.fail("examples/send_packets.py raised ExceptionType unexpectedly!")
 
 

diff --git a/tests/test_messages.py b/tests/test_messages.py
@@ -37,12 +37,12 @@ def test_encode(self):
         self.assertEqual(messages.ADIS.encode(data), expect)
 
     def test_roll_message(self):
-        data = {'PWM': -1.35e-3, 'Disable': 1}
+        data = {'Angle': 1.3, 'Disable': 1}
 
         encode = messages.ROLL.encode(data)
         decode = messages.ROLL.decode(encode)
 
-        self.assertAlmostEqual(decode['PWM'], data['PWM'], delta=0.1e-3)
+        self.assertAlmostEqual(decode['Angle'], data['Angle'], delta=0.1e-1)
         self.assertEqual(decode['Disable'], data['Disable'])