diff options
| author |   yayogev <yaronyogev@gmail.com> | 2018-03-21 17:31:54 +0200 |
|---|---|---|
| committer | yayogev <yaronyogev@gmail.com> | 2018-03-21 17:47:01 +0200 |
| commit | 2e47d8704fa0fe56ced38ddb4fc94f111079bd82 (patch) | |
| tree | 83e03bef41619bdce913057a08eeaf4b9be6d601 /app/messages | |
| parent | 648a394f7a318443dfd82f790f83a79616c26905 (diff) | |
Python 3.4 backwards compatibility (for 'verify' job)
cherry-picked from internal commit by ilia on 07/02/2018 19:49
Change-Id: I03caf42492785a9af5e8301ca202b00a7b4af787
Signed-off-by: yayogev <yaronyogev@gmail.com>
Diffstat (limited to 'app/messages')
| -rw-r--r-- | app/messages/message.py | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/app/messages/message.py b/app/messages/message.py index eeef329..dd4c1d3 100644 --- a/app/messages/message.py +++ b/app/messages/message.py @@ -8,9 +8,8 @@ # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### import datetime -from typing import Union -from bson import ObjectId +from utils.util import merge_dicts class Message: @@ -23,8 +22,8 @@ class Message: msg: dict, source: str, env: str = None, - object_id: Union[str, ObjectId] = None, - display_context: Union[str, ObjectId] = None, + object_id=None, + display_context=None, level: str = DEFAULT_LEVEL, object_type: str = None, ts: datetime = None, @@ -52,18 +51,21 @@ class Message: self.extra = kwargs def get(self): - return { - "id": self.id, - "environment": self.environment, - "source_system": self.source_system, - "related_object": self.related_object, - "related_object_type": self.related_object_type, - "display_context": self.display_context, - "level": self.level, - "message": self.message, - "timestamp": self.timestamp, - "received_timestamp": self.received_timestamp, - "finished_timestamp": self.finished_timestamp, - "viewed": self.viewed, - **self.extra - } + return merge_dicts( + self.extra, + { + "id": self.id, + "environment": self.environment, + "source_system": self.source_system, + "related_object": self.related_object, + "related_object_type": self.related_object_type, + "display_context": self.display_context, + "level": self.level, + "message": self.message, + "timestamp": self.timestamp, + "received_timestamp": self.received_timestamp, + "finished_timestamp": self.finished_timestamp, + "viewed": self.viewed + } + ) + |