From d86918216a474b28b101c4f2d1aa4477da676627 Mon Sep 17 00:00:00 2001 From: Florian Ludwig Date: Sat, 27 Mar 2021 13:29:25 +0100 Subject: [PATCH] rename hbmqtt -> amqtt in module itself --- amqtt/broker.py | 10 +++---- amqtt/client.py | 24 +++++++-------- amqtt/codecs.py | 2 +- amqtt/mqtt/__init__.py | 32 ++++++++++---------- amqtt/mqtt/connack.py | 8 ++--- amqtt/mqtt/connect.py | 10 +++---- amqtt/mqtt/disconnect.py | 4 +-- amqtt/mqtt/packet.py | 6 ++-- amqtt/mqtt/pingreq.py | 4 +-- amqtt/mqtt/pingresp.py | 4 +-- amqtt/mqtt/protocol/broker_handler.py | 28 +++++++++--------- amqtt/mqtt/protocol/client_handler.py | 24 +++++++-------- amqtt/mqtt/protocol/handler.py | 42 +++++++++++++-------------- amqtt/mqtt/puback.py | 4 +-- amqtt/mqtt/pubcomp.py | 4 +-- amqtt/mqtt/publish.py | 6 ++-- amqtt/mqtt/pubrec.py | 4 +-- amqtt/mqtt/pubrel.py | 4 +-- amqtt/mqtt/suback.py | 8 ++--- amqtt/mqtt/subscribe.py | 6 ++-- amqtt/mqtt/unsuback.py | 4 +-- amqtt/mqtt/unsubscribe.py | 6 ++-- amqtt/plugins/sys/broker.py | 8 ++--- amqtt/session.py | 22 +++++++------- amqtt/version.py | 6 ++-- 25 files changed, 140 insertions(+), 140 deletions(-) diff --git a/amqtt/broker.py b/amqtt/broker.py index 6c0df9f..fb25bf7 100644 --- a/amqtt/broker.py +++ b/amqtt/broker.py @@ -12,11 +12,11 @@ from collections import deque from functools import partial from transitions import Machine, MachineError -from hbmqtt.session import Session -from hbmqtt.mqtt.protocol.broker_handler import BrokerProtocolHandler -from hbmqtt.errors import HBMQTTException, MQTTException -from hbmqtt.utils import format_client_message, gen_client_id -from hbmqtt.adapters import ( +from amqtt.session import Session +from amqtt.mqtt.protocol.broker_handler import BrokerProtocolHandler +from amqtt.errors import HBMQTTException, MQTTException +from amqtt.utils import format_client_message, gen_client_id +from amqtt.adapters import ( StreamReaderAdapter, StreamWriterAdapter, ReaderAdapter, diff --git a/amqtt/client.py b/amqtt/client.py index bb5038f..f07653e 100644 --- a/amqtt/client.py +++ b/amqtt/client.py @@ -9,18 +9,18 @@ import copy from urllib.parse import urlparse, urlunparse from functools import wraps -from hbmqtt.session import Session -from hbmqtt.mqtt.connack import CONNECTION_ACCEPTED -from hbmqtt.mqtt.protocol.client_handler import ClientProtocolHandler -from hbmqtt.adapters import ( +from amqtt.session import Session +from amqtt.mqtt.connack import CONNECTION_ACCEPTED +from amqtt.mqtt.protocol.client_handler import ClientProtocolHandler +from amqtt.adapters import ( StreamReaderAdapter, StreamWriterAdapter, WebSocketsReader, WebSocketsWriter, ) -from hbmqtt.plugins.manager import PluginManager, BaseContext -from hbmqtt.mqtt.protocol.handler import ProtocolHandlerException -from hbmqtt.mqtt.constants import QOS_0, QOS_1, QOS_2 +from amqtt.plugins.manager import PluginManager, BaseContext +from amqtt.mqtt.protocol.handler import ProtocolHandlerException +from amqtt.mqtt.constants import QOS_0, QOS_1, QOS_2 import websockets from websockets.uri import InvalidURI from websockets.exceptions import InvalidHandshake @@ -90,7 +90,7 @@ class MQTTClient: MQTTClient instances provides API for connecting to a broker and send/receive messages using the MQTT protocol. - :param client_id: MQTT client ID to use when connecting to the broker. If none, it will generated randomly by :func:`hbmqtt.utils.gen_client_id` + :param client_id: MQTT client ID to use when connecting to the broker. If none, it will generated randomly by :func:`amqtt.utils.gen_client_id` :param config: Client configuration :param loop: asynio loop to use :return: class instance @@ -104,7 +104,7 @@ class MQTTClient: if client_id is not None: self.client_id = client_id else: - from hbmqtt.utils import gen_client_id + from amqtt.utils import gen_client_id self.client_id = gen_client_id() self.logger.debug("Using generated client ID : %s" % self.client_id) @@ -151,7 +151,7 @@ class MQTTClient: :param cadata: server certificate authority data (optional, used for secured connection) :param extra_headers: a dictionary with additional http headers that should be sent on the initial connection (optional, used only with websocket connections) :return: `CONNACK `_ return code - :raise: :class:`hbmqtt.client.ConnectException` if connection fails + :raise: :class:`amqtt.client.ConnectException` if connection fails """ if extra_headers is None: @@ -217,7 +217,7 @@ class MQTTClient: :param cleansession: clean session flag used in MQTT CONNECT messages sent for reconnections. :return: `CONNACK `_ return code - :raise: :class:`hbmqtt.client.ConnectException` if re-connection fails after max retries. + :raise: :class:`amqtt.client.ConnectException` if re-connection fails after max retries. """ if self.session.transitions.is_connected(): @@ -364,7 +364,7 @@ class MQTTClient: This method is a *coroutine*. :param timeout: maximum number of seconds to wait before returning. If timeout is not specified or None, there is no limit to the wait time until next message arrives. - :return: instance of :class:`hbmqtt.session.ApplicationMessage` containing received message information flow. + :return: instance of :class:`amqtt.session.ApplicationMessage` containing received message information flow. :raises: :class:`asyncio.TimeoutError` if timeout occurs before a message is delivered """ deliver_task = asyncio.ensure_future( diff --git a/amqtt/codecs.py b/amqtt/codecs.py index bde80bd..45cb7c5 100644 --- a/amqtt/codecs.py +++ b/amqtt/codecs.py @@ -3,7 +3,7 @@ # See the file license.txt for copying permission. import asyncio from struct import pack, unpack -from hbmqtt.errors import NoDataException +from amqtt.errors import NoDataException def bytes_to_hex_str(data): diff --git a/amqtt/mqtt/__init__.py b/amqtt/mqtt/__init__.py index da97d44..808c971 100644 --- a/amqtt/mqtt/__init__.py +++ b/amqtt/mqtt/__init__.py @@ -1,8 +1,8 @@ # Copyright (c) 2015 Nicolas JOUANIN # # See the file license.txt for copying permission. -from hbmqtt.errors import HBMQTTException -from hbmqtt.mqtt.packet import ( +from amqtt.errors import HBMQTTException +from amqtt.mqtt.packet import ( CONNECT, CONNACK, PUBLISH, @@ -19,20 +19,20 @@ from hbmqtt.mqtt.packet import ( DISCONNECT, MQTTFixedHeader, ) -from hbmqtt.mqtt.connect import ConnectPacket -from hbmqtt.mqtt.connack import ConnackPacket -from hbmqtt.mqtt.disconnect import DisconnectPacket -from hbmqtt.mqtt.pingreq import PingReqPacket -from hbmqtt.mqtt.pingresp import PingRespPacket -from hbmqtt.mqtt.publish import PublishPacket -from hbmqtt.mqtt.puback import PubackPacket -from hbmqtt.mqtt.pubrec import PubrecPacket -from hbmqtt.mqtt.pubrel import PubrelPacket -from hbmqtt.mqtt.pubcomp import PubcompPacket -from hbmqtt.mqtt.subscribe import SubscribePacket -from hbmqtt.mqtt.suback import SubackPacket -from hbmqtt.mqtt.unsubscribe import UnsubscribePacket -from hbmqtt.mqtt.unsuback import UnsubackPacket +from amqtt.mqtt.connect import ConnectPacket +from amqtt.mqtt.connack import ConnackPacket +from amqtt.mqtt.disconnect import DisconnectPacket +from amqtt.mqtt.pingreq import PingReqPacket +from amqtt.mqtt.pingresp import PingRespPacket +from amqtt.mqtt.publish import PublishPacket +from amqtt.mqtt.puback import PubackPacket +from amqtt.mqtt.pubrec import PubrecPacket +from amqtt.mqtt.pubrel import PubrelPacket +from amqtt.mqtt.pubcomp import PubcompPacket +from amqtt.mqtt.subscribe import SubscribePacket +from amqtt.mqtt.suback import SubackPacket +from amqtt.mqtt.unsubscribe import UnsubscribePacket +from amqtt.mqtt.unsuback import UnsubackPacket packet_dict = { CONNECT: ConnectPacket, diff --git a/amqtt/mqtt/connack.py b/amqtt/mqtt/connack.py index ad9a4ed..dc1d035 100644 --- a/amqtt/mqtt/connack.py +++ b/amqtt/mqtt/connack.py @@ -1,10 +1,10 @@ # Copyright (c) 2015 Nicolas JOUANIN # # See the file license.txt for copying permission. -from hbmqtt.mqtt.packet import CONNACK, MQTTPacket, MQTTFixedHeader, MQTTVariableHeader -from hbmqtt.codecs import read_or_raise, bytes_to_int -from hbmqtt.errors import HBMQTTException -from hbmqtt.adapters import ReaderAdapter +from amqtt.mqtt.packet import CONNACK, MQTTPacket, MQTTFixedHeader, MQTTVariableHeader +from amqtt.codecs import read_or_raise, bytes_to_int +from amqtt.errors import HBMQTTException +from amqtt.adapters import ReaderAdapter CONNECTION_ACCEPTED = 0x00 UNACCEPTABLE_PROTOCOL_VERSION = 0x01 diff --git a/amqtt/mqtt/connect.py b/amqtt/mqtt/connect.py index cbd1d9b..380f29a 100644 --- a/amqtt/mqtt/connect.py +++ b/amqtt/mqtt/connect.py @@ -2,7 +2,7 @@ # # See the file license.txt for copying permission. -from hbmqtt.codecs import ( +from amqtt.codecs import ( bytes_to_int, decode_data_with_length, decode_string, @@ -11,16 +11,16 @@ from hbmqtt.codecs import ( int_to_bytes, read_or_raise, ) -from hbmqtt.mqtt.packet import ( +from amqtt.mqtt.packet import ( MQTTPacket, MQTTFixedHeader, CONNECT, MQTTVariableHeader, MQTTPayload, ) -from hbmqtt.errors import HBMQTTException, NoDataException -from hbmqtt.adapters import ReaderAdapter -from hbmqtt.utils import gen_client_id +from amqtt.errors import HBMQTTException, NoDataException +from amqtt.adapters import ReaderAdapter +from amqtt.utils import gen_client_id class ConnectVariableHeader(MQTTVariableHeader): diff --git a/amqtt/mqtt/disconnect.py b/amqtt/mqtt/disconnect.py index b5bfad8..686caa9 100644 --- a/amqtt/mqtt/disconnect.py +++ b/amqtt/mqtt/disconnect.py @@ -1,8 +1,8 @@ # Copyright (c) 2015 Nicolas JOUANIN # # See the file license.txt for copying permission. -from hbmqtt.mqtt.packet import MQTTPacket, MQTTFixedHeader, DISCONNECT -from hbmqtt.errors import HBMQTTException +from amqtt.mqtt.packet import MQTTPacket, MQTTFixedHeader, DISCONNECT +from amqtt.errors import HBMQTTException class DisconnectPacket(MQTTPacket): diff --git a/amqtt/mqtt/packet.py b/amqtt/mqtt/packet.py index 046fe01..e5561c7 100644 --- a/amqtt/mqtt/packet.py +++ b/amqtt/mqtt/packet.py @@ -3,14 +3,14 @@ # See the file license.txt for copying permission. import asyncio -from hbmqtt.codecs import ( +from amqtt.codecs import ( bytes_to_hex_str, decode_packet_id, int_to_bytes, read_or_raise, ) -from hbmqtt.errors import CodecException, MQTTException, NoDataException -from hbmqtt.adapters import ReaderAdapter, WriterAdapter +from amqtt.errors import CodecException, MQTTException, NoDataException +from amqtt.adapters import ReaderAdapter, WriterAdapter from datetime import datetime from struct import unpack diff --git a/amqtt/mqtt/pingreq.py b/amqtt/mqtt/pingreq.py index d99c925..a1f1ab9 100644 --- a/amqtt/mqtt/pingreq.py +++ b/amqtt/mqtt/pingreq.py @@ -1,8 +1,8 @@ # Copyright (c) 2015 Nicolas JOUANIN # # See the file license.txt for copying permission. -from hbmqtt.mqtt.packet import MQTTPacket, MQTTFixedHeader, PINGREQ -from hbmqtt.errors import HBMQTTException +from amqtt.mqtt.packet import MQTTPacket, MQTTFixedHeader, PINGREQ +from amqtt.errors import HBMQTTException class PingReqPacket(MQTTPacket): diff --git a/amqtt/mqtt/pingresp.py b/amqtt/mqtt/pingresp.py index bd36cda..c2d5697 100644 --- a/amqtt/mqtt/pingresp.py +++ b/amqtt/mqtt/pingresp.py @@ -1,8 +1,8 @@ # Copyright (c) 2015 Nicolas JOUANIN # # See the file license.txt for copying permission. -from hbmqtt.mqtt.packet import MQTTPacket, MQTTFixedHeader, PINGRESP -from hbmqtt.errors import HBMQTTException +from amqtt.mqtt.packet import MQTTPacket, MQTTFixedHeader, PINGRESP +from amqtt.errors import HBMQTTException class PingRespPacket(MQTTPacket): diff --git a/amqtt/mqtt/protocol/broker_handler.py b/amqtt/mqtt/protocol/broker_handler.py index bda3eb1..11ee484 100644 --- a/amqtt/mqtt/protocol/broker_handler.py +++ b/amqtt/mqtt/protocol/broker_handler.py @@ -2,8 +2,8 @@ # # See the file license.txt for copying permission. from asyncio import futures, Queue -from hbmqtt.mqtt.protocol.handler import ProtocolHandler -from hbmqtt.mqtt.connack import ( +from amqtt.mqtt.protocol.handler import ProtocolHandler +from amqtt.mqtt.connack import ( CONNECTION_ACCEPTED, UNACCEPTABLE_PROTOCOL_VERSION, IDENTIFIER_REJECTED, @@ -11,18 +11,18 @@ from hbmqtt.mqtt.connack import ( NOT_AUTHORIZED, ConnackPacket, ) -from hbmqtt.mqtt.connect import ConnectPacket -from hbmqtt.mqtt.pingreq import PingReqPacket -from hbmqtt.mqtt.pingresp import PingRespPacket -from hbmqtt.mqtt.subscribe import SubscribePacket -from hbmqtt.mqtt.suback import SubackPacket -from hbmqtt.mqtt.unsubscribe import UnsubscribePacket -from hbmqtt.mqtt.unsuback import UnsubackPacket -from hbmqtt.utils import format_client_message -from hbmqtt.session import Session -from hbmqtt.plugins.manager import PluginManager -from hbmqtt.adapters import ReaderAdapter, WriterAdapter -from hbmqtt.errors import MQTTException +from amqtt.mqtt.connect import ConnectPacket +from amqtt.mqtt.pingreq import PingReqPacket +from amqtt.mqtt.pingresp import PingRespPacket +from amqtt.mqtt.subscribe import SubscribePacket +from amqtt.mqtt.suback import SubackPacket +from amqtt.mqtt.unsubscribe import UnsubscribePacket +from amqtt.mqtt.unsuback import UnsubackPacket +from amqtt.utils import format_client_message +from amqtt.session import Session +from amqtt.plugins.manager import PluginManager +from amqtt.adapters import ReaderAdapter, WriterAdapter +from amqtt.errors import MQTTException from .handler import EVENT_MQTT_PACKET_RECEIVED, EVENT_MQTT_PACKET_SENT diff --git a/amqtt/mqtt/protocol/client_handler.py b/amqtt/mqtt/protocol/client_handler.py index e4eaa91..8f4468b 100644 --- a/amqtt/mqtt/protocol/client_handler.py +++ b/amqtt/mqtt/protocol/client_handler.py @@ -3,18 +3,18 @@ # See the file license.txt for copying permission. import asyncio from asyncio import futures -from hbmqtt.mqtt.protocol.handler import ProtocolHandler, EVENT_MQTT_PACKET_RECEIVED -from hbmqtt.mqtt.disconnect import DisconnectPacket -from hbmqtt.mqtt.pingreq import PingReqPacket -from hbmqtt.mqtt.pingresp import PingRespPacket -from hbmqtt.mqtt.subscribe import SubscribePacket -from hbmqtt.mqtt.suback import SubackPacket -from hbmqtt.mqtt.unsubscribe import UnsubscribePacket -from hbmqtt.mqtt.unsuback import UnsubackPacket -from hbmqtt.mqtt.connect import ConnectVariableHeader, ConnectPayload, ConnectPacket -from hbmqtt.mqtt.connack import ConnackPacket -from hbmqtt.session import Session -from hbmqtt.plugins.manager import PluginManager +from amqtt.mqtt.protocol.handler import ProtocolHandler, EVENT_MQTT_PACKET_RECEIVED +from amqtt.mqtt.disconnect import DisconnectPacket +from amqtt.mqtt.pingreq import PingReqPacket +from amqtt.mqtt.pingresp import PingRespPacket +from amqtt.mqtt.subscribe import SubscribePacket +from amqtt.mqtt.suback import SubackPacket +from amqtt.mqtt.unsubscribe import UnsubscribePacket +from amqtt.mqtt.unsuback import UnsubackPacket +from amqtt.mqtt.connect import ConnectVariableHeader, ConnectPayload, ConnectPacket +from amqtt.mqtt.connack import ConnackPacket +from amqtt.session import Session +from amqtt.plugins.manager import PluginManager class ClientProtocolHandler(ProtocolHandler): diff --git a/amqtt/mqtt/protocol/handler.py b/amqtt/mqtt/protocol/handler.py index 0145903..3c037ab 100644 --- a/amqtt/mqtt/protocol/handler.py +++ b/amqtt/mqtt/protocol/handler.py @@ -8,10 +8,10 @@ import itertools import asyncio from asyncio import InvalidStateError -from hbmqtt.mqtt import packet_class -from hbmqtt.mqtt.connack import ConnackPacket -from hbmqtt.mqtt.connect import ConnectPacket -from hbmqtt.mqtt.packet import ( +from amqtt.mqtt import packet_class +from amqtt.mqtt.connack import ConnackPacket +from amqtt.mqtt.connect import ConnectPacket +from amqtt.mqtt.packet import ( RESERVED_0, CONNECT, CONNACK, @@ -30,29 +30,29 @@ from hbmqtt.mqtt.packet import ( RESERVED_15, MQTTFixedHeader, ) -from hbmqtt.mqtt.pingresp import PingRespPacket -from hbmqtt.mqtt.pingreq import PingReqPacket -from hbmqtt.mqtt.publish import PublishPacket -from hbmqtt.mqtt.pubrel import PubrelPacket -from hbmqtt.mqtt.puback import PubackPacket -from hbmqtt.mqtt.pubrec import PubrecPacket -from hbmqtt.mqtt.pubcomp import PubcompPacket -from hbmqtt.mqtt.suback import SubackPacket -from hbmqtt.mqtt.subscribe import SubscribePacket -from hbmqtt.mqtt.unsubscribe import UnsubscribePacket -from hbmqtt.mqtt.unsuback import UnsubackPacket -from hbmqtt.mqtt.disconnect import DisconnectPacket -from hbmqtt.adapters import ReaderAdapter, WriterAdapter -from hbmqtt.session import ( +from amqtt.mqtt.pingresp import PingRespPacket +from amqtt.mqtt.pingreq import PingReqPacket +from amqtt.mqtt.publish import PublishPacket +from amqtt.mqtt.pubrel import PubrelPacket +from amqtt.mqtt.puback import PubackPacket +from amqtt.mqtt.pubrec import PubrecPacket +from amqtt.mqtt.pubcomp import PubcompPacket +from amqtt.mqtt.suback import SubackPacket +from amqtt.mqtt.subscribe import SubscribePacket +from amqtt.mqtt.unsubscribe import UnsubscribePacket +from amqtt.mqtt.unsuback import UnsubackPacket +from amqtt.mqtt.disconnect import DisconnectPacket +from amqtt.adapters import ReaderAdapter, WriterAdapter +from amqtt.session import ( Session, OutgoingApplicationMessage, IncomingApplicationMessage, INCOMING, OUTGOING, ) -from hbmqtt.mqtt.constants import QOS_0, QOS_1, QOS_2 -from hbmqtt.plugins.manager import PluginManager -from hbmqtt.errors import HBMQTTException, MQTTException, NoDataException +from amqtt.mqtt.constants import QOS_0, QOS_1, QOS_2 +from amqtt.plugins.manager import PluginManager +from amqtt.errors import HBMQTTException, MQTTException, NoDataException EVENT_MQTT_PACKET_SENT = "mqtt_packet_sent" diff --git a/amqtt/mqtt/puback.py b/amqtt/mqtt/puback.py index 78ddfae..809cedf 100644 --- a/amqtt/mqtt/puback.py +++ b/amqtt/mqtt/puback.py @@ -1,13 +1,13 @@ # Copyright (c) 2015 Nicolas JOUANIN # # See the file license.txt for copying permission. -from hbmqtt.mqtt.packet import ( +from amqtt.mqtt.packet import ( MQTTPacket, MQTTFixedHeader, PUBACK, PacketIdVariableHeader, ) -from hbmqtt.errors import HBMQTTException +from amqtt.errors import HBMQTTException class PubackPacket(MQTTPacket): diff --git a/amqtt/mqtt/pubcomp.py b/amqtt/mqtt/pubcomp.py index ace5174..d5bc49b 100644 --- a/amqtt/mqtt/pubcomp.py +++ b/amqtt/mqtt/pubcomp.py @@ -1,13 +1,13 @@ # Copyright (c) 2015 Nicolas JOUANIN # # See the file license.txt for copying permission. -from hbmqtt.mqtt.packet import ( +from amqtt.mqtt.packet import ( MQTTPacket, MQTTFixedHeader, PUBCOMP, PacketIdVariableHeader, ) -from hbmqtt.errors import HBMQTTException +from amqtt.errors import HBMQTTException class PubcompPacket(MQTTPacket): diff --git a/amqtt/mqtt/publish.py b/amqtt/mqtt/publish.py index e016ce3..fa37854 100644 --- a/amqtt/mqtt/publish.py +++ b/amqtt/mqtt/publish.py @@ -3,15 +3,15 @@ # See the file license.txt for copying permission. import asyncio -from hbmqtt.mqtt.packet import ( +from amqtt.mqtt.packet import ( MQTTPacket, MQTTFixedHeader, PUBLISH, MQTTVariableHeader, MQTTPayload, ) -from hbmqtt.errors import HBMQTTException, MQTTException -from hbmqtt.codecs import decode_packet_id, decode_string, encode_string, int_to_bytes +from amqtt.errors import HBMQTTException, MQTTException +from amqtt.codecs import decode_packet_id, decode_string, encode_string, int_to_bytes class PublishVariableHeader(MQTTVariableHeader): diff --git a/amqtt/mqtt/pubrec.py b/amqtt/mqtt/pubrec.py index eb3e764..5a29200 100644 --- a/amqtt/mqtt/pubrec.py +++ b/amqtt/mqtt/pubrec.py @@ -1,13 +1,13 @@ # Copyright (c) 2015 Nicolas JOUANIN # # See the file license.txt for copying permission. -from hbmqtt.mqtt.packet import ( +from amqtt.mqtt.packet import ( MQTTPacket, MQTTFixedHeader, PUBREC, PacketIdVariableHeader, ) -from hbmqtt.errors import HBMQTTException +from amqtt.errors import HBMQTTException class PubrecPacket(MQTTPacket): diff --git a/amqtt/mqtt/pubrel.py b/amqtt/mqtt/pubrel.py index f69472c..af4f0f1 100644 --- a/amqtt/mqtt/pubrel.py +++ b/amqtt/mqtt/pubrel.py @@ -1,13 +1,13 @@ # Copyright (c) 2015 Nicolas JOUANIN # # See the file license.txt for copying permission. -from hbmqtt.mqtt.packet import ( +from amqtt.mqtt.packet import ( MQTTPacket, MQTTFixedHeader, PUBREL, PacketIdVariableHeader, ) -from hbmqtt.errors import HBMQTTException +from amqtt.errors import HBMQTTException class PubrelPacket(MQTTPacket): diff --git a/amqtt/mqtt/suback.py b/amqtt/mqtt/suback.py index 29ab4ca..5439aa3 100644 --- a/amqtt/mqtt/suback.py +++ b/amqtt/mqtt/suback.py @@ -1,7 +1,7 @@ # Copyright (c) 2015 Nicolas JOUANIN # # See the file license.txt for copying permission. -from hbmqtt.mqtt.packet import ( +from amqtt.mqtt.packet import ( MQTTPacket, MQTTFixedHeader, SUBACK, @@ -9,9 +9,9 @@ from hbmqtt.mqtt.packet import ( MQTTPayload, MQTTVariableHeader, ) -from hbmqtt.errors import HBMQTTException, NoDataException -from hbmqtt.adapters import ReaderAdapter -from hbmqtt.codecs import bytes_to_int, int_to_bytes, read_or_raise +from amqtt.errors import HBMQTTException, NoDataException +from amqtt.adapters import ReaderAdapter +from amqtt.codecs import bytes_to_int, int_to_bytes, read_or_raise class SubackPayload(MQTTPayload): diff --git a/amqtt/mqtt/subscribe.py b/amqtt/mqtt/subscribe.py index 864447c..14725eb 100644 --- a/amqtt/mqtt/subscribe.py +++ b/amqtt/mqtt/subscribe.py @@ -3,7 +3,7 @@ # See the file license.txt for copying permission. import asyncio -from hbmqtt.mqtt.packet import ( +from amqtt.mqtt.packet import ( MQTTPacket, MQTTFixedHeader, SUBSCRIBE, @@ -11,8 +11,8 @@ from hbmqtt.mqtt.packet import ( MQTTPayload, MQTTVariableHeader, ) -from hbmqtt.errors import HBMQTTException, NoDataException -from hbmqtt.codecs import ( +from amqtt.errors import HBMQTTException, NoDataException +from amqtt.codecs import ( bytes_to_int, decode_string, encode_string, diff --git a/amqtt/mqtt/unsuback.py b/amqtt/mqtt/unsuback.py index b7ed88d..0484509 100644 --- a/amqtt/mqtt/unsuback.py +++ b/amqtt/mqtt/unsuback.py @@ -1,13 +1,13 @@ # Copyright (c) 2015 Nicolas JOUANIN # # See the file license.txt for copying permission. -from hbmqtt.mqtt.packet import ( +from amqtt.mqtt.packet import ( MQTTPacket, MQTTFixedHeader, UNSUBACK, PacketIdVariableHeader, ) -from hbmqtt.errors import HBMQTTException +from amqtt.errors import HBMQTTException class UnsubackPacket(MQTTPacket): diff --git a/amqtt/mqtt/unsubscribe.py b/amqtt/mqtt/unsubscribe.py index a289e24..1600c6f 100644 --- a/amqtt/mqtt/unsubscribe.py +++ b/amqtt/mqtt/unsubscribe.py @@ -3,7 +3,7 @@ # See the file license.txt for copying permission. import asyncio -from hbmqtt.mqtt.packet import ( +from amqtt.mqtt.packet import ( MQTTPacket, MQTTFixedHeader, UNSUBSCRIBE, @@ -11,8 +11,8 @@ from hbmqtt.mqtt.packet import ( MQTTPayload, MQTTVariableHeader, ) -from hbmqtt.errors import HBMQTTException, NoDataException -from hbmqtt.codecs import decode_string, encode_string +from amqtt.errors import HBMQTTException, NoDataException +from amqtt.codecs import decode_string, encode_string class UnubscribePayload(MQTTPayload): diff --git a/amqtt/plugins/sys/broker.py b/amqtt/plugins/sys/broker.py index 77e1dda..01fedd7 100644 --- a/amqtt/plugins/sys/broker.py +++ b/amqtt/plugins/sys/broker.py @@ -5,9 +5,9 @@ from datetime import datetime from collections import deque import asyncio -import hbmqtt -from hbmqtt.mqtt.packet import PUBLISH -from hbmqtt.codecs import int_to_bytes_str +import amqtt +from amqtt.mqtt.packet import PUBLISH +from amqtt.codecs import int_to_bytes_str DOLLAR_SYS_ROOT = "$SYS/broker/" @@ -61,7 +61,7 @@ class BrokerSysPlugin: async def on_broker_post_start(self, *args, **kwargs): self._stats[STAT_START_TIME] = datetime.now() - version = f"HBMQTT version {hbmqtt.__version__}" + version = f"HBMQTT version {amqtt.__version__}" self.context.retain_message(DOLLAR_SYS_ROOT + "version", version.encode()) # Start $SYS topics management diff --git a/amqtt/session.py b/amqtt/session.py index a23a01d..be8580b 100644 --- a/amqtt/session.py +++ b/amqtt/session.py @@ -5,8 +5,8 @@ import asyncio from transitions import Machine from asyncio import Queue from collections import OrderedDict -from hbmqtt.mqtt.publish import PublishPacket -from hbmqtt.errors import HBMQTTException +from amqtt.mqtt.publish import PublishPacket +from amqtt.errors import HBMQTTException OUTGOING = 0 INCOMING = 1 @@ -48,26 +48,26 @@ class ApplicationMessage: """ Publish message retain flag""" self.publish_packet = None - """ :class:`hbmqtt.mqtt.publish.PublishPacket` instance corresponding to the `PUBLISH `_ packet in the messages flow. ``None`` if the PUBLISH packet has not already been received or sent.""" + """ :class:`amqtt.mqtt.publish.PublishPacket` instance corresponding to the `PUBLISH `_ packet in the messages flow. ``None`` if the PUBLISH packet has not already been received or sent.""" self.puback_packet = None - """ :class:`hbmqtt.mqtt.puback.PubackPacket` instance corresponding to the `PUBACK `_ packet in the messages flow. ``None`` if QoS != QOS_1 or if the PUBACK packet has not already been received or sent.""" + """ :class:`amqtt.mqtt.puback.PubackPacket` instance corresponding to the `PUBACK `_ packet in the messages flow. ``None`` if QoS != QOS_1 or if the PUBACK packet has not already been received or sent.""" self.pubrec_packet = None - """ :class:`hbmqtt.mqtt.puback.PubrecPacket` instance corresponding to the `PUBREC `_ packet in the messages flow. ``None`` if QoS != QOS_2 or if the PUBREC packet has not already been received or sent.""" + """ :class:`amqtt.mqtt.puback.PubrecPacket` instance corresponding to the `PUBREC `_ packet in the messages flow. ``None`` if QoS != QOS_2 or if the PUBREC packet has not already been received or sent.""" self.pubrel_packet = None - """ :class:`hbmqtt.mqtt.puback.PubrelPacket` instance corresponding to the `PUBREL `_ packet in the messages flow. ``None`` if QoS != QOS_2 or if the PUBREL packet has not already been received or sent.""" + """ :class:`amqtt.mqtt.puback.PubrelPacket` instance corresponding to the `PUBREL `_ packet in the messages flow. ``None`` if QoS != QOS_2 or if the PUBREL packet has not already been received or sent.""" self.pubcomp_packet = None - """ :class:`hbmqtt.mqtt.puback.PubrelPacket` instance corresponding to the `PUBCOMP `_ packet in the messages flow. ``None`` if QoS != QOS_2 or if the PUBCOMP packet has not already been received or sent.""" + """ :class:`amqtt.mqtt.puback.PubrelPacket` instance corresponding to the `PUBCOMP `_ packet in the messages flow. ``None`` if QoS != QOS_2 or if the PUBCOMP packet has not already been received or sent.""" def build_publish_packet(self, dup=False): """ - Build :class:`hbmqtt.mqtt.publish.PublishPacket` from attributes + Build :class:`amqtt.mqtt.publish.PublishPacket` from attributes :param dup: force dup flag - :return: :class:`hbmqtt.mqtt.publish.PublishPacket` built from ApplicationMessage instance attributes + :return: :class:`amqtt.mqtt.publish.PublishPacket` built from ApplicationMessage instance attributes """ return PublishPacket.build( self.topic, self.data, self.packet_id, dup, self.qos, self.retain @@ -80,7 +80,7 @@ class ApplicationMessage: class IncomingApplicationMessage(ApplicationMessage): """ - Incoming :class:`~hbmqtt.session.ApplicationMessage`. + Incoming :class:`~amqtt.session.ApplicationMessage`. """ __slots__ = ("direction",) @@ -93,7 +93,7 @@ class IncomingApplicationMessage(ApplicationMessage): class OutgoingApplicationMessage(ApplicationMessage): """ - Outgoing :class:`~hbmqtt.session.ApplicationMessage`. + Outgoing :class:`~amqtt.session.ApplicationMessage`. """ __slots__ = ("direction",) diff --git a/amqtt/version.py b/amqtt/version.py index 8b568c6..6d2241a 100644 --- a/amqtt/version.py +++ b/amqtt/version.py @@ -4,14 +4,14 @@ import os import subprocess import warnings -import hbmqtt +import amqtt def get_version(): warnings.warn( - "hbmqtt.version.get_version() is deprecated, use hbmqtt.__version__ instead" + "amqtt.version.get_version() is deprecated, use amqtt.__version__ instead" ) - return hbmqtt.__version__ + return amqtt.__version__ def get_git_changeset():