merge commit conflicts in messagetypes
This commit is contained in:
commit
52c849703f
|
@ -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"""
|
||||||
|
|
|
@ -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"""
|
||||||
|
|
Reference in New Issue
Block a user