Show More
@@ -405,7 +405,7 b' class Session(Configurable):' | |||||
405 | def msg_header(self, msg_type): |
|
405 | def msg_header(self, msg_type): | |
406 | return msg_header(self.msg_id, msg_type, self.username, self.session) |
|
406 | return msg_header(self.msg_id, msg_type, self.username, self.session) | |
407 |
|
407 | |||
408 |
def msg(self, msg_type, content=None, parent=None, |
|
408 | def msg(self, msg_type, content=None, parent=None, header=None, metadata=None): | |
409 | """Return the nested message dict. |
|
409 | """Return the nested message dict. | |
410 |
|
410 | |||
411 | This format is different from what is sent over the wire. The |
|
411 | This format is different from what is sent over the wire. The | |
@@ -415,8 +415,6 b' class Session(Configurable):' | |||||
415 | msg = {} |
|
415 | msg = {} | |
416 | header = self.msg_header(msg_type) if header is None else header |
|
416 | header = self.msg_header(msg_type) if header is None else header | |
417 | msg['header'] = header |
|
417 | msg['header'] = header | |
418 | if subheader is not None: |
|
|||
419 | msg['header'].update(subheader) |
|
|||
420 | msg['msg_id'] = header['msg_id'] |
|
418 | msg['msg_id'] = header['msg_id'] | |
421 | msg['msg_type'] = header['msg_type'] |
|
419 | msg['msg_type'] = header['msg_type'] | |
422 | msg['parent_header'] = {} if parent is None else extract_header(parent) |
|
420 | msg['parent_header'] = {} if parent is None else extract_header(parent) | |
@@ -499,7 +497,7 b' class Session(Configurable):' | |||||
499 | return to_send |
|
497 | return to_send | |
500 |
|
498 | |||
501 | def send(self, stream, msg_or_type, content=None, parent=None, ident=None, |
|
499 | def send(self, stream, msg_or_type, content=None, parent=None, ident=None, | |
502 |
buffers |
|
500 | buffers=None, track=False, header=None, metadata=None): | |
503 | """Build and send a message via stream or socket. |
|
501 | """Build and send a message via stream or socket. | |
504 |
|
502 | |||
505 | The message format used by this function internally is as follows: |
|
503 | The message format used by this function internally is as follows: | |
@@ -529,9 +527,6 b' class Session(Configurable):' | |||||
529 | (ignored if msg_or_type is a message). |
|
527 | (ignored if msg_or_type is a message). | |
530 | ident : bytes or list of bytes |
|
528 | ident : bytes or list of bytes | |
531 | The zmq.IDENTITY routing path. |
|
529 | The zmq.IDENTITY routing path. | |
532 | subheader : dict or None |
|
|||
533 | Extra header keys for this message's header (ignored if msg_or_type |
|
|||
534 | is a message). |
|
|||
535 | metadata : dict or None |
|
530 | metadata : dict or None | |
536 | The metadata describing the message |
|
531 | The metadata describing the message | |
537 | buffers : list or None |
|
532 | buffers : list or None | |
@@ -563,7 +558,7 b' class Session(Configurable):' | |||||
563 | msg = msg_or_type |
|
558 | msg = msg_or_type | |
564 | else: |
|
559 | else: | |
565 | msg = self.msg(msg_or_type, content=content, parent=parent, |
|
560 | msg = self.msg(msg_or_type, content=content, parent=parent, | |
566 |
|
|
561 | header=header, metadata=metadata) | |
567 |
|
562 | |||
568 | buffers = [] if buffers is None else buffers |
|
563 | buffers = [] if buffers is None else buffers | |
569 | to_send = self.serialize(msg, ident) |
|
564 | to_send = self.serialize(msg, ident) | |
@@ -730,9 +725,9 b' class Session(Configurable):' | |||||
730 | if signature in self.digest_history: |
|
725 | if signature in self.digest_history: | |
731 | raise ValueError("Duplicate Signature: %r"%signature) |
|
726 | raise ValueError("Duplicate Signature: %r"%signature) | |
732 | self.digest_history.add(signature) |
|
727 | self.digest_history.add(signature) | |
733 |
check = self.sign(msg_list[1: |
|
728 | check = self.sign(msg_list[1:5]) | |
734 | if not signature == check: |
|
729 | if not signature == check: | |
735 | raise ValueError("Invalid Signature: %r"%signature) |
|
730 | raise ValueError("Invalid Signature: %r" % signature) | |
736 | if not len(msg_list) >= minlen: |
|
731 | if not len(msg_list) >= minlen: | |
737 | raise TypeError("malformed message, must have at least %i elements"%minlen) |
|
732 | raise TypeError("malformed message, must have at least %i elements"%minlen) | |
738 | header = self.unpack(msg_list[1]) |
|
733 | header = self.unpack(msg_list[1]) |
General Comments 0
You need to be logged in to leave comments.
Login now