merge commit conflicts in messagetypes

This commit is contained in:
Navjot 2019-09-30 19:38:00 +05:30
commit 52c849703f
No known key found for this signature in database
GPG Key ID: 9EE70AFD71357F1C
2 changed files with 6 additions and 4 deletions

View File

@ -1,6 +1,6 @@
""" """
src/messagetypes/message.py src/messagetypes/message.py
================================= ===========================
""" """
from debug import logger from debug import logger
from messagetypes import MsgBase from messagetypes import MsgBase
@ -8,7 +8,8 @@ from messagetypes import MsgBase
class Message(MsgBase): class Message(MsgBase):
"""Base method, helps to decode, encode and process the message""" """Encapsulate a message"""
# pylint: disable=attribute-defined-outside-init
def decode(self, data): def decode(self, data):
"""Decode a message""" """Decode a message"""

View File

@ -1,6 +1,6 @@
""" """
src/messagetypes/vote.py src/messagetypes/vote.py
================================= ========================
""" """
from debug import logger from debug import logger
from messagetypes import MsgBase from messagetypes import MsgBase
@ -8,8 +8,9 @@ from messagetypes import MsgBase
class Vote(MsgBase): class Vote(MsgBase):
"""Base method, helps to decode, encode and process the message""" """Module used to vote"""
def decode(self, data): def decode(self, data):
"""decode a vote""" """decode a vote"""