scalar test

Author: Fedor Baart

mmi/__init__.py

@@ -29,7 +29,8 @@ def send_array(socket, A, flags=0, copy=False, track=False, metadata=None):
     try:
         # If an array has a fill value assume it's an array with missings
         # store the fill_Value in the metadata and fill the array before sending.
-        md['fill_value'] = A.fill_value
+        # asscalar should work for scalar, 0d array or nd array of size 1
+        md['fill_value'] = np.asscalar(A.fill_value)
         A = A.filled()
     except AttributeError:
         # no masked array, nothing to do

tests/test_simple.py

@@ -18,6 +18,7 @@ def test_sndrcv(self):
         mmi.send_array(req, A)
         B, metadata = mmi.recv_array(rep)
         numpy.testing.assert_array_equal(A, B)
+
     def test_metadata_only(self):
         """send a message with only metadata"""
         req = ctx.socket(zmq.REQ)
@@ -42,3 +43,19 @@ def test_missing(self):
 
 
 
+    def test_missing_scalar(self):
+        """send an array with missing data"""
+        A = np.array([1, 2, 3, 4])
+        A = np.ma.masked_less(A, 2)
+        # test if it works if we use a numpy scalar
+        A.fill_value = np.int32(9999)
+        req = ctx.socket(zmq.REQ)
+        req.connect('tcp://localhost:9002')
+        rep = ctx.socket(zmq.REP)
+        rep.bind('tcp://*:9002')
+        mmi.send_array(req, A)
+        B, metadata = mmi.recv_array(rep)
+        numpy.testing.assert_array_equal(A, B)
+
+
+