Extra check on context manager exit

Author: fafhrd91

CHANGES.rst

@@ -1,6 +1,12 @@
 CHANGES
 =======
 
+1.1.1 (2017-03-11)
+------------------
+
+* Extra check on context manager exit
+
+
 1.1.0 (2016-10-20)
 ------------------
 

async_timeout/__init__.py

@@ -1,7 +1,7 @@
 import asyncio
 
 
-__version__ = '1.1.0'
+__version__ = '1.1.1'
 
 
 class timeout:
@@ -42,7 +42,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
             self._cancel_handler = None
             self._task = None
             raise asyncio.TimeoutError from None
-        if self._timeout is not None:
+        if self._timeout is not None and self._cancel_handler is not None:
             self._cancel_handler.cancel()
             self._cancel_handler = None
         self._task = None

setup.py

@@ -31,6 +31,7 @@ def read(name):
           'Programming Language :: Python :: 3',
           'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
           'Topic :: Internet :: WWW/HTTP'],
       author='Andrew Svetlov',
       author_email='[email protected]',