Raise the correct exception from AnyMsg.serialize (#1311)

Previously, this was causing `TypeError: 'module' object is not callable`, which was not noticed due to the bare `except:` in the test.
ros · Feb 9, 2018 · a3a06d4 · a3a06d4
1 parent 4d4774b
commit a3a06d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/clients/rospy/src/rospy/msg.py b/clients/rospy/src/rospy/msg.py
@@ -69,7 +69,7 @@ def __init__(self, *args):
     def serialize(self, buff):
         """AnyMsg provides an implementation so that a node can forward messages w/o (de)serialization"""
         if self._buff is None:
-            raise rospy.exceptions("AnyMsg is not initialized")
+            raise rospy.exceptions.ROSException("AnyMsg is not initialized")
         else:
             buff.write(self._buff)
 

diff --git a/test/test_rospy/test/unit/test_rospy_api.py b/test/test_rospy/test/unit/test_rospy_api.py
@@ -66,12 +66,13 @@ def test_anymsg(self):
         except ImportError:
             from io import StringIO
         import rospy
+        import rospy.exceptions
         #trip wires against AnyMsg API
         m = rospy.AnyMsg()
         try:
             m.serialize(StringIO())
             self.fail("AnyMsg should not allow serialization")
-        except:
+        except rospy.exceptions.ROSException:
             pass
 
         teststr = 'foostr-%s'%time.time()