Don't suppress nested exception (#13)

* Don't suppress nested exception

* Update CHANGES

* Drop redundant check

* Tune requirements

* Add missing file

Author: asvetlov

.travis.yml

@@ -6,14 +6,11 @@ python:
 
 install:
   - pip install -e .
-  - pip install docutils
+  - pip install -r requirements.txt
   - pip install codecov
-  - pip install pytest
-  - pip install pytest_aiohttp
-  - pip install pytest-runner
 
 script:
-  - python -m pytest tests
+  - pytest tests
   - python setup.py check -rm
   - if python -c "import sys; sys.exit(sys.version_info < (3,5))"; then
         python setup.py check -s;

CHANGES.rst

@@ -1,6 +1,12 @@
 CHANGES
 =======
 
+1.3.0 (2017-xx-xx)
+------------------
+
+* Don't suppress nested exception on timeout. Exception context points
+  on cancelled line with suspended `await` (#13)
+
 1.2.1 (2017-05-02)
 ------------------
 

async_timeout/__init__.py

@@ -43,7 +43,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         if exc_type is asyncio.CancelledError and self._cancelled:
             self._cancel_handler = None
             self._task = None
-            raise asyncio.TimeoutError from None
+            raise asyncio.TimeoutError
         if self._timeout is not None and self._cancel_handler is not None:
             self._cancel_handler.cancel()
             self._cancel_handler = None

requirements.txt

@@ -0,0 +1,3 @@
+pytest==3.2.1
+pytest-aiohttp==0.1.3
+docutils==0.14

setup.py

@@ -40,6 +40,4 @@ def read(name):
       url='https://github.com/aio-libs/async_timeout/',
       license='Apache 2',
       packages=['async_timeout'],
-      setup_requires=[],
-      tests_require=['pytest', 'pytest_aiohttp', 'pytest-runner'],
       include_package_data=False)

tests/test_timeout.py

@@ -201,7 +201,6 @@ def outer():
 def test_timeout_suppress_exception_chain(loop):
 
     with pytest.raises(asyncio.TimeoutError) as ctx:
-        with timeout(0.01, loop=loop) as t:
+        with timeout(0.01, loop=loop):
             yield from asyncio.sleep(10, loop=loop)
-            assert t._loop is loop
-    assert ctx.value.__suppress_context__
+    assert not ctx.value.__suppress_context__