Adaptions for Python 3.8.

.travis.yml

@@ -4,6 +4,7 @@ language: python
 
 python:
   - "3.7"
+  - "3.8"
 
 install:
   - pip install coveralls

mqttools/client.py

@@ -314,7 +314,7 @@ async def start(self, resume_session=False):
                 break
             except SessionResumeError:
                 raise
-            except Exception as e:
+            except (Exception, asyncio.CancelledError) as e:
                 if isinstance(e, ConnectionRefusedError):
                     LOGGER.info('TCP connect refused.')
                 elif isinstance(e, TimeoutError):
@@ -370,7 +370,7 @@ async def _start(self, resume_session=False):
             if not resume_session or not session_present:
                 for topic in self._subscriptions:
                     await self.subscribe(topic)
-        except Exception:
+        except (Exception, asyncio.CancelledError):
             await self.stop()
             raise
 
@@ -390,23 +390,23 @@ async def stop(self):
 
         try:
             self.disconnect()
-        except Exception:
+        except (Exception, asyncio.CancelledError):
             pass
 
         if self._reader_task is not None:
             self._reader_task.cancel()
 
             try:
                 await self._reader_task
-            except Exception:
+            except (Exception, asyncio.CancelledError):
                 pass
 
         if self._keep_alive_task is not None:
             self._keep_alive_task.cancel()
 
             try:
                 await self._keep_alive_task
-            except Exception:
+            except (Exception, asyncio.CancelledError):
                 pass
 
         if self._writer is not None:
@@ -630,7 +630,7 @@ async def _reader_main(self):
 
         try:
             await self.reader_loop()
-        except Exception as e:
+        except (Exception, asyncio.CancelledError) as e:
             LOGGER.info('Reader task stopped by %r.', e)
 
             if isinstance(e, MalformedPacketError):
@@ -658,7 +658,7 @@ async def _keep_alive_main(self):
 
         try:
             await self.keep_alive_loop()
-        except Exception as e:
+        except (Exception, asyncio.CancelledError) as e:
             LOGGER.info('Keep alive task stopped by %r.', e)
             await self._close()