fix blobdispatch and annotation data type problem

Author: irmen

.gitignore

@@ -10,3 +10,4 @@
 /.cache/
 /.eggs/
 /.mypy_cache/
+/.pytest_cache/

Pyro5/client.py

@@ -651,7 +651,8 @@ def deserialized(self):
         if self._contains_blob:
             protocol_msg = self._data
             serializer = serializers.serializers_by_id[protocol_msg.serializer_id]
-            return serializer.loads(protocol_msg.data)
+            _, _, data, _ = serializer.loads(protocol_msg.data)
+            return data
         else:
             return self._data
 

Pyro5/protocol.py

@@ -97,8 +97,8 @@ def __init__(self, msgtype, flags, seq, serializer_id, payload, annotations=None
             if len(k) != 4:
                 raise errors.ProtocolError("annotation identifier must be 4 ascii characters")
             annotation_data.append(struct.pack("!4sI", k.encode("ascii"), len(v)))
-            if not isinstance(v, (bytes, bytearray)):
-                raise errors.ProtocolError("annotation data must be bytes")
+            if not isinstance(v, (bytes, bytearray, memoryview)):
+                raise errors.ProtocolError("annotation data must be bytes, bytearray, or memoryview", type(v))
             annotation_data.append(v)    # note: annotations are not compressed by Pyro
         self.data = header_data + b"".join(annotation_data) + payload
 

examples/blob-dispatch/client/client.py

@@ -18,7 +18,5 @@
             break
         # create our custom data object and send it through the dispatcher
         data = CustomData(42, "hello world", datetime.datetime.now())
-
-        # @todo FIX THIS -- CRASHES WITH SOCKET ERROR NOT ENOUGH DATA
         dispatcher.process_blob(Pyro5.api.SerializedBlob(topic, data))
         print("processed")