diff --git a/docs/conf.py b/docs/conf.py index 9d4a88f..8438670 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -302,6 +302,7 @@ if not on_rtd: # only import and set the theme if we're building docs locally html_theme = 'sphinx_rtd_theme' html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] # Override default css to get a larger width for local build + def setup(app): #app.add_javascript("custom.js") app.add_stylesheet('theme_overrides.css') @@ -313,4 +314,4 @@ else: 'https://media.readthedocs.org/css/readthedocs-doc-embed.css', '_static/theme_overrides.css', ], - } \ No newline at end of file + } diff --git a/hbmqtt/broker.py b/hbmqtt/broker.py index 63be527..8a6ce6f 100644 --- a/hbmqtt/broker.py +++ b/hbmqtt/broker.py @@ -500,7 +500,6 @@ class Broker: self.logger.debug("%s Client disconnected" % client_session.client_id) server.release_connection() - def _init_handler(self, session, reader, writer): """ Create a BrokerProtocolHandler and attach to a session diff --git a/hbmqtt/client.py b/hbmqtt/client.py index bb169fc..671068f 100644 --- a/hbmqtt/client.py +++ b/hbmqtt/client.py @@ -54,6 +54,7 @@ class ClientContext(BaseContext): super().__init__() self.config = None + base_logger = logging.getLogger(__name__) @@ -112,7 +113,6 @@ class MQTTClient: self.plugins_manager = PluginManager('hbmqtt.client.plugins', context) self.client_tasks = deque() - @asyncio.coroutine def connect(self, uri=None, @@ -210,7 +210,6 @@ class MQTTClient: yield from asyncio.sleep(delay, loop=self._loop) nb_attempt += 1 - @asyncio.coroutine def _do_connect(self): return_code = yield from self._connect_coro() diff --git a/hbmqtt/mqtt/protocol/handler.py b/hbmqtt/mqtt/protocol/handler.py index 8eeb90b..11025bf 100644 --- a/hbmqtt/mqtt/protocol/handler.py +++ b/hbmqtt/mqtt/protocol/handler.py @@ -353,7 +353,6 @@ class ProtocolHandler: except asyncio.CancelledError: self.logger.debug("Message flow cancelled") - @asyncio.coroutine def _reader_loop(self): self.logger.debug("%s Starting reader coro" % self.session.client_id) diff --git a/hbmqtt/utils.py b/hbmqtt/utils.py index 44fda79..1c2a104 100644 --- a/hbmqtt/utils.py +++ b/hbmqtt/utils.py @@ -38,6 +38,7 @@ def gen_client_id(): gen_id += chr(random.randint(0, 74) + 48) return gen_id + def read_yaml_config(config_file): config = None try: @@ -45,4 +46,4 @@ def read_yaml_config(config_file): config = yaml.load(stream) except yaml.YAMLError as exc: logger.error("Invalid config_file %s: %s" % (config_file, exc)) - return config \ No newline at end of file + return config diff --git a/samples/broker_start.py b/samples/broker_start.py index d503185..356f4c1 100644 --- a/samples/broker_start.py +++ b/samples/broker_start.py @@ -30,6 +30,7 @@ config = { broker = Broker(config) + @asyncio.coroutine def test_coro(): yield from broker.start() @@ -42,4 +43,4 @@ if __name__ == '__main__': #formatter = "%(asctime)s :: %(levelname)s :: %(message)s" logging.basicConfig(level=logging.INFO, format=formatter) asyncio.get_event_loop().run_until_complete(test_coro()) - asyncio.get_event_loop().run_forever() \ No newline at end of file + asyncio.get_event_loop().run_forever() diff --git a/samples/client_keepalive.py b/samples/client_keepalive.py index c9238dc..05b7ecd 100644 --- a/samples/client_keepalive.py +++ b/samples/client_keepalive.py @@ -18,6 +18,7 @@ config = { } C = MQTTClient(config=config) + @asyncio.coroutine def test_coro(): yield from C.connect('mqtt://test.mosquitto.org:1883/') @@ -29,4 +30,4 @@ def test_coro(): if __name__ == '__main__': formatter = "[%(asctime)s] {%(filename)s:%(lineno)d} %(levelname)s - %(message)s" logging.basicConfig(level=logging.DEBUG, format=formatter) - asyncio.get_event_loop().run_until_complete(test_coro()) \ No newline at end of file + asyncio.get_event_loop().run_until_complete(test_coro()) diff --git a/samples/client_publish_ssl.py b/samples/client_publish_ssl.py index 5b893e4..4575be7 100644 --- a/samples/client_publish_ssl.py +++ b/samples/client_publish_ssl.py @@ -5,7 +5,6 @@ from hbmqtt.client import MQTTClient from hbmqtt.mqtt.constants import QOS_1, QOS_2 - # # This sample shows how to publish messages to broker using different QOS # Debug outputs shows the message flows @@ -24,6 +23,7 @@ config = { C = MQTTClient(config=config) #C = MQTTClient() + @asyncio.coroutine def test_coro(): yield from C.connect('mqtts://test.mosquitto.org/', cafile='mosquitto.org.crt') @@ -40,4 +40,4 @@ def test_coro(): if __name__ == '__main__': formatter = "[%(asctime)s] {%(filename)s:%(lineno)d} %(levelname)s - %(message)s" logging.basicConfig(level=logging.DEBUG, format=formatter) - asyncio.get_event_loop().run_until_complete(test_coro()) \ No newline at end of file + asyncio.get_event_loop().run_until_complete(test_coro()) diff --git a/samples/client_publish_ws.py b/samples/client_publish_ws.py index 9bd239e..fbf1cd0 100644 --- a/samples/client_publish_ws.py +++ b/samples/client_publish_ws.py @@ -24,6 +24,7 @@ config = { C = MQTTClient(config=config) #C = MQTTClient() + @asyncio.coroutine def test_coro(): yield from C.connect('wss://test.mosquitto.org:8081/', cafile='mosquitto.org.crt') @@ -40,4 +41,4 @@ def test_coro(): if __name__ == '__main__': formatter = "[%(asctime)s] {%(filename)s:%(lineno)d} %(levelname)s - %(message)s" logging.basicConfig(level=logging.DEBUG, format=formatter) - asyncio.get_event_loop().run_until_complete(test_coro()) \ No newline at end of file + asyncio.get_event_loop().run_until_complete(test_coro()) diff --git a/samples/client_subscribe.py b/samples/client_subscribe.py index a7dddd0..cab1a4d 100644 --- a/samples/client_subscribe.py +++ b/samples/client_subscribe.py @@ -13,6 +13,7 @@ from hbmqtt.mqtt.constants import QOS_1, QOS_2 logger = logging.getLogger(__name__) + @asyncio.coroutine def uptime_coro(): C = MQTTClient() @@ -38,4 +39,4 @@ def uptime_coro(): if __name__ == '__main__': formatter = "[%(asctime)s] {%(filename)s:%(lineno)d} %(levelname)s - %(message)s" logging.basicConfig(level=logging.INFO, format=formatter) - asyncio.get_event_loop().run_until_complete(uptime_coro()) \ No newline at end of file + asyncio.get_event_loop().run_until_complete(uptime_coro()) diff --git a/tests/test_client.py b/tests/test_client.py index 7c4c080..0050385 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -214,6 +214,7 @@ class MQTTClientTest(unittest.TestCase): def test_deliver(self): data = b'data' + @asyncio.coroutine def test_coro(): try: diff --git a/tox.ini b/tox.ini index 695ebff..535ceb3 100644 --- a/tox.ini +++ b/tox.ini @@ -6,11 +6,6 @@ ignore = E126, # continuation line over-indented for hanging indent (~5 warnings) E127, # continuation line over-indented for visual indent (~5 warnings) E128, # continuation line under-indented for visual indent (~7 warnings) - E301, # expected 1 blank line, found 0 (~1 warnings) - E302, # expected 2 blank lines, found 1 (~6 warnings) - E303, # too many blank lines (2) (~5 warnings) - E305, # expected 2 blank lines after class or function definition, found 1 (~1 warnings) - E306, # expected 1 blank line before a nested definition, found 0 (~1 warnings) E402, # module level import not at top of file (~24 warnings) F401, # 'x' imported but unused (~12 warnings) F403, # 'from x import *' used; unable to detect undefined names (~29 warnings)