From f53ae9e10ae4b8ac203e10a2c97dfbeb5a949d07 Mon Sep 17 00:00:00 2001
From: Nicolas Jouanin <nico@beerfactory.org>
Date: Wed, 8 Jul 2015 21:22:47 +0200
Subject: [PATCH] Remove config argument to handler

---
 hbmqtt/client.py                       | 5 ++---
 hbmqtt/mqtt/protocol/client_handler.py | 4 ++--
 hbmqtt/mqtt/protocol/handler.py        | 7 ++++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hbmqtt/client.py b/hbmqtt/client.py
index 28020d9..b56a603 100644
--- a/hbmqtt/client.py
+++ b/hbmqtt/client.py
@@ -18,7 +18,6 @@ _defaults = {
     'ping_delay': 1,
     'default_qos': 0,
     'default_retain': False,
-    'subscriptions-polling-interval': 1,
 }
 
 
@@ -188,7 +187,7 @@ class MQTTClient:
         try:
             self.session.reader, self.session.writer = \
                 yield from asyncio.open_connection(self.session.remote_address, self.session.remote_port)
-            self._handler = ClientProtocolHandler(self.session, self.config)
+            self._handler = ClientProtocolHandler(self.session)
             yield from self._handler.start()
 
             return_code = yield from self._handler.mqtt_connect()
@@ -251,7 +250,7 @@ class MQTTClient:
             s.cleansession = cleansession
         else:
             s.cleansession = self.config.get('cleansession', True)
-        s.keep_alive = self.config['keep_alive']
+        s.keep_alive = self.config['keep_alive'] - self.config['ping_delay']
         if 'will' in self.config:
             s.will_flag = True
             s.will_retain = self.config['will']['retain']
diff --git a/hbmqtt/mqtt/protocol/client_handler.py b/hbmqtt/mqtt/protocol/client_handler.py
index 52e86b9..09fb443 100644
--- a/hbmqtt/mqtt/protocol/client_handler.py
+++ b/hbmqtt/mqtt/protocol/client_handler.py
@@ -19,8 +19,8 @@ from hbmqtt.mqtt.unsuback import UnsubackPacket
 from hbmqtt.session import Session
 
 class ClientProtocolHandler(ProtocolHandler):
-    def __init__(self, session: Session, config, loop=None):
-        super().__init__(session, config, loop)
+    def __init__(self, session: Session, loop=None):
+        super().__init__(session, loop)
         self._ping_task = None
         self._connack_waiter = None
         self._pingresp_queue = asyncio.Queue()
diff --git a/hbmqtt/mqtt/protocol/handler.py b/hbmqtt/mqtt/protocol/handler.py
index 5e544df..0b17ee6 100644
--- a/hbmqtt/mqtt/protocol/handler.py
+++ b/hbmqtt/mqtt/protocol/handler.py
@@ -49,10 +49,9 @@ class ProtocolHandler:
     Class implementing the MQTT communication protocol using asyncio features
     """
 
-    def __init__(self, session: Session, config, loop=None):
+    def __init__(self, session: Session, loop=None):
         self.logger = logging.getLogger(__name__)
         self.session = session
-        self.config = config
         if loop is None:
             self._loop = asyncio.get_event_loop()
         else:
@@ -182,10 +181,12 @@ class ProtocolHandler:
     @asyncio.coroutine
     def _writer_coro(self):
         self.logger.debug("Starting writer coro")
-        keepalive_timeout = self.session.keep_alive - self.config['ping_delay']
         while self._running:
             try:
                 self._writer_ready.set()
+                keepalive_timeout = self.session.keep_alive
+                if keepalive_timeout <= 0:
+                    keepalive_timeout = None
                 packet = yield from asyncio.wait_for(self.outgoing_queue.get(), keepalive_timeout)
                 yield from packet.to_stream(self.session.writer)
                 self.logger.debug(" -out-> " + repr(packet))