diff --git a/hbmqtt/mqtt/connack.py b/hbmqtt/mqtt/connack.py index 467170c..2879160 100644 --- a/hbmqtt/mqtt/connack.py +++ b/hbmqtt/mqtt/connack.py @@ -43,14 +43,14 @@ class ConnackVariableHeader(MQTTVariableHeader): return out def __repr__(self): - return 'ConnackVariableHeader(session_parent={0}, return_code={1})'.format(hex(self.session_parent), hex(self.return_code.value)) + return type(self).__name__ + '(session_parent={0}, return_code={1})'.format(hex(self.session_parent), hex(self.return_code.value)) class ConnackPacket(MQTTPacket): VARIABLE_HEADER = ConnackVariableHeader PAYLOAD = None - def __init__(self, fixed: MQTTFixedHeader, variable_header: ConnackVariableHeader=None): + def __init__(self, fixed: MQTTFixedHeader=None, variable_header: ConnackVariableHeader=None, payload=None): if fixed is None: header = MQTTFixedHeader(PacketType.CONNACK, 0x00) else: diff --git a/hbmqtt/mqtt/packet.py b/hbmqtt/mqtt/packet.py index c6de8a8..ba1ef3e 100644 --- a/hbmqtt/mqtt/packet.py +++ b/hbmqtt/mqtt/packet.py @@ -120,7 +120,7 @@ class MQTTFixedHeader: return cls(msg_type, flags, remain_length) def __repr__(self): - return 'MQTTFixedHeader(type={0}, length={1}, flags={2})'.format(self.packet_type, self.remaining_length, hex(self.flags)) + return type(self).__name__ + '(type={0}, length={1}, flags={2})'.format(self.packet_type, self.remaining_length, hex(self.flags)) class MQTTVariableHeader(metaclass=abc.ABCMeta): def __init__(self): @@ -209,7 +209,7 @@ class MQTTPacket: return cls(fixed_header, variable_header, payload) def __repr__(self): - return 'MQPacket(fixed={0!r}, variable={1!r}, payload={2!r})'.format(self.fixed_header, self.variable_header, self.payload) + return type(self).__name__ + '(fixed={0!r}, variable={1!r}, payload={2!r})'.format(self.fixed_header, self.variable_header, self.payload) class PacketIdVariableHeader(MQTTVariableHeader): diff --git a/hbmqtt/mqtt/pingreq.py b/hbmqtt/mqtt/pingreq.py index d51a7e2..f886ec7 100644 --- a/hbmqtt/mqtt/pingreq.py +++ b/hbmqtt/mqtt/pingreq.py @@ -8,7 +8,7 @@ class PingReqPacket(MQTTPacket): VARIABLE_HEADER = None PAYLOAD = None - def __init__(self, fixed: MQTTFixedHeader=None): + def __init__(self, fixed: MQTTFixedHeader=None, variable_header=None, payload=None): if fixed is None: header = MQTTFixedHeader(PacketType.PINGREQ, 0x00) else: diff --git a/hbmqtt/mqtt/pingresp.py b/hbmqtt/mqtt/pingresp.py index 2f0a704..9802198 100644 --- a/hbmqtt/mqtt/pingresp.py +++ b/hbmqtt/mqtt/pingresp.py @@ -8,7 +8,7 @@ class PingRespPacket(MQTTPacket): VARIABLE_HEADER = None PAYLOAD = None - def __init__(self, fixed: MQTTFixedHeader=None): + def __init__(self, fixed: MQTTFixedHeader=None, variable_header=None, payload=None): if fixed is None: header = MQTTFixedHeader(PacketType.PINGREQ, 0x00) else: