From d7a8b721efe50ada19acdc22d473bff5635da52f Mon Sep 17 00:00:00 2001 From: meejah Date: Tue, 16 Jun 2020 16:41:20 -0600 Subject: [PATCH 1/3] internal-only router attributes --- autobahn/wamp/message.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/autobahn/wamp/message.py b/autobahn/wamp/message.py index fa74c71f9..fe20eb3c2 100644 --- a/autobahn/wamp/message.py +++ b/autobahn/wamp/message.py @@ -378,6 +378,13 @@ class Message(object): '_correlation_uri', '_correlation_is_anchor', '_correlation_is_last', + + '_internal_publisher', + '_internal_publisher_authid', + '_internal_publisher_authrole', + '_internal_caller', + '_internal_caller_authid', + '_internal_caller_authrole', ) def __init__(self, from_fbs=None): @@ -393,6 +400,14 @@ def __init__(self, from_fbs=None): self._correlation_is_anchor = None self._correlation_is_last = None + # non-serialized 'internal' attributes (used by Crossbar router) + self._internal_publisher = None + self._internal_publisher_authid = None + self._internal_publisher_authrole = None + self._internal_caller = None + self._internal_caller_authid = None + self._internal_caller_authrole = None + @property def correlation_id(self): return self._correlation_id From 633ab95bdd047b8a17a9fb967f989dbde5160bdd Mon Sep 17 00:00:00 2001 From: meejah Date: Tue, 16 Jun 2020 16:52:12 -0600 Subject: [PATCH 2/3] hook for router to add custom information --- autobahn/wamp/message.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/autobahn/wamp/message.py b/autobahn/wamp/message.py index fe20eb3c2..8461654be 100644 --- a/autobahn/wamp/message.py +++ b/autobahn/wamp/message.py @@ -379,12 +379,7 @@ class Message(object): '_correlation_is_anchor', '_correlation_is_last', - '_internal_publisher', - '_internal_publisher_authid', - '_internal_publisher_authrole', - '_internal_caller', - '_internal_caller_authid', - '_internal_caller_authrole', + '_router_internal', ) def __init__(self, from_fbs=None): @@ -401,12 +396,7 @@ def __init__(self, from_fbs=None): self._correlation_is_last = None # non-serialized 'internal' attributes (used by Crossbar router) - self._internal_publisher = None - self._internal_publisher_authid = None - self._internal_publisher_authrole = None - self._internal_caller = None - self._internal_caller_authid = None - self._internal_caller_authrole = None + self._router_internal = None @property def correlation_id(self): From 9d901b83d795994d1df1caea48f1ec9b22bb4ae9 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Wed, 17 Jun 2020 09:52:04 +0200 Subject: [PATCH 3/3] use cpy 3.8 for running flake (see comments here https://github.com/crossbario/autobahn-python/pull/1393#issuecomment-645208437) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a4e2390e2..9b6ef5b68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ matrix: # # Flake8 # - - python: "3.5" + - python: "3.8" env: - TOX_ENV=flake8