drop support for py3.5 and aiohttp2.x

Currently supported versions of Python: 3.6, 3.7, 3.8

Author: pnuckowski

.travis.yml

@@ -5,37 +5,6 @@ language: python
 
 matrix:
   include:
-  - python: 3.5
-    env: TOXENV=py35-aiohttp20
-  - python: 3.5
-    env: TOXENV=py35-aiohttp21
-  - python: 3.5
-    env: TOXENV=py35-aiohttp22
-  - python: 3.5
-    env: TOXENV=py35-aiohttp23
-  - python: 3.5
-    env: TOXENV=py35-aiohttp30
-  - python: 3.5
-    env: TOXENV=py35-aiohttp31
-  - python: 3.5
-    env: TOXENV=py35-aiohttp32
-  - python: 3.5
-    env: TOXENV=py35-aiohttp33
-  - python: 3.5
-    env: TOXENV=py35-aiohttp34
-  - python: 3.5
-    env: TOXENV=py35-aiohttp35
-  - python: 3.5
-    env: TOXENV=py35-aiohttp36
-
-  - python: 3.6
-    env: TOXENV=py36-aiohttp20
-  - python: 3.6
-    env: TOXENV=py36-aiohttp21
-  - python: 3.6
-    env: TOXENV=py36-aiohttp22
-  - python: 3.6
-    env: TOXENV=py36-aiohttp23
   - python: 3.6
     env: TOXENV=py36-aiohttp30
   - python: 3.6

Makefile

@@ -44,6 +44,7 @@ clean-pyc: ## remove Python file artifacts
 
 clean-test: ## remove test and coverage artifacts
 	rm -fr .tox/
+	rm -fr .pytest_cache/
 	rm -f .coverage
 	rm -fr htmlcov/
 

aioresponses/compat.py

@@ -9,18 +9,40 @@
 from multidict import MultiDict
 from yarl import URL
 
+try:
+    # as from Py3.8 unittest supports coroutines as test functions
+    from unittest import IsolatedAsyncioTestCase, skipIf
+
+
+    def fail_on(**kw):  # noqa
+        def outer(fn):
+            def inner(*args, **kwargs):
+                return fn(*args, **kwargs)
+
+            return inner
+
+        return outer
+
+
+except ImportError:
+    # fallback to asynctest
+    from asynctest import fail_on, skipIf
+    from asynctest.case import TestCase as IsolatedAsyncioTestCase
+
 if sys.version_info < (3, 7):
     from re import _pattern_type as Pattern
 else:
     from re import Pattern
 
 AIOHTTP_VERSION = StrictVersion(aiohttp_version)
+IS_GTE_PY38 = sys.version_info >= (3, 8)
 
 if AIOHTTP_VERSION >= StrictVersion('3.0.0'):
     from aiohttp.client_proto import ResponseHandler
 
-    def stream_reader_factory(
-            loop: 'Optional[asyncio.AbstractEventLoop]' = None
+
+    def stream_reader_factory(  # noqa
+        loop: 'Optional[asyncio.AbstractEventLoop]' = None
     ):
         protocol = ResponseHandler(loop=loop)
         return StreamReader(protocol, loop=loop)
@@ -46,11 +68,47 @@ def normalize_url(url: 'Union[URL, str]') -> 'URL':
     return url.with_query(urlencode(sorted(parse_qsl(url.query_string))))
 
 
+class AsyncTestCase(IsolatedAsyncioTestCase):
+    """Asynchronous test case class that covers up differences in usage
+    between unittest (starting from Python 3.8) and asynctest.
+
+    `setup` and `teardown` is used to be called before each test case
+    (note: that they are in lowercase)
+    """
+
+    async def setup(self):
+        pass
+
+    async def teardown(self):
+        pass
+
+    if IS_GTE_PY38:
+        # from Python3.8
+        async def asyncSetUp(self):
+            self.loop = asyncio.get_event_loop()
+            await self.setup()
+
+        async def asyncTearDown(self):
+            await self.teardown()
+    else:
+        # asynctest
+        use_default_loop = False
+
+        async def setUp(self) -> None:
+            await self.setup()
+
+        async def tearDown(self) -> None:
+            await self.teardown()
+
+
 __all__ = [
     'URL',
     'Pattern',
+    'skipIf',
     'AIOHTTP_VERSION',
+    'AsyncTestCase',
     'merge_params',
     'stream_reader_factory',
     'normalize_url',
+    'fail_on',
 ]

aioresponses/core.py

@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 import asyncio
-import json
 import copy
+import inspect
+import json
 from collections import namedtuple
 from distutils.version import StrictVersion
 from functools import wraps
 from typing import Callable, Dict, Tuple, Union, Optional, List  # noqa
 from unittest.mock import Mock, patch
-import inspect
+
 from aiohttp import (
     ClientConnectionError,
     ClientResponse,
@@ -174,7 +175,7 @@ def _build_response(self, url: 'Union[URL, str]',
         return resp
 
     async def build_response(
-            self, url: URL, **kwargs
+        self, url: URL, **kwargs
     ) -> 'Union[ClientResponse, Exception]':
         if self.exception is not None:
             return self.exception
@@ -324,8 +325,8 @@ def is_exception(resp_or_exc: Union[ClientResponse, Exception]) -> bool:
         return False
 
     async def match(
-            self, method: str, url: URL,
-            allow_redirects: bool = True, **kwargs: Dict
+        self, method: str, url: URL,
+        allow_redirects: bool = True, **kwargs: Dict
     ) -> Optional['ClientResponse']:
         history = []
         while True:
@@ -343,9 +344,8 @@ async def match(
 
             if self.is_exception(response_or_exc):
                 raise response_or_exc
-
-            if response_or_exc.status in (
-                    301, 302, 303, 307, 308) and allow_redirects:
+            is_redirect = response_or_exc.status in (301, 302, 303, 307, 308)
+            if is_redirect and allow_redirects:
                 if hdrs.LOCATION not in response_or_exc.headers:
                     break
                 history.append(response_or_exc)

requirements-dev.txt

@@ -1,11 +1,12 @@
 pip
 wheel
-flake8==3.5.0
-tox==3.4.0
-coverage==4.5.1
+flake8==3.8.3
+tox==3.19.0
+coverage==5.2.1
 Sphinx==1.5.6
-pytest==3.8.1
-pytest-cov==2.6.0
-pytest-html==1.19.0
-ddt==1.2.0
+pytest==6.0.1
+pytest-cov==2.10.1
+pytest-html==2.1.1
+ddt==1.4.1
 typing
+asynctest==0.13.0

setup.cfg

@@ -6,16 +6,18 @@ summary = Mock out requests made by ClientSession from aiohttp package
 description-file = README.rst
 home-page = https://github.com/pnuckowski/aioresponses
 classifier =
-  Development Status :: 3 - Alpha
+  Development Status :: 4 - Beta
   Intended Audience :: Developers
+  Operating System :: OS Independent
   Topic :: Internet :: WWW/HTTP
   Topic :: Software Development :: Testing
+  Topic :: Software Development :: Testing :: Mocking
   License :: OSI Approved :: MIT License
   Natural Language :: English
   Programming Language :: Python :: 3
-  Programming Language :: Python :: 3.5
   Programming Language :: Python :: 3.6
   Programming Language :: Python :: 3.7
+  Programming Language :: Python :: 3.8
 
 [files]
 packages =

tests/test_aioresponses.py

@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 import asyncio
 import re
+from asyncio import CancelledError, TimeoutError
 from typing import Coroutine, Generator, Union
-from unittest import IsolatedAsyncioTestCase, skipIf
 from unittest.mock import patch
 
 from aiohttp import hdrs
 from aiohttp import http
 from aiohttp.client import ClientSession
 from aiohttp.client_reqrep import ClientResponse
 from ddt import ddt, data
-from asyncio import CancelledError, TimeoutError
+
 try:
     from aiohttp.errors import (
         ClientConnectionError,
@@ -24,30 +24,33 @@
     )
     from aiohttp.http_exceptions import HttpProcessingError
 
-from aioresponses.compat import AIOHTTP_VERSION, URL
+from aioresponses.compat import (
+    AIOHTTP_VERSION, URL,
+    fail_on,
+    skipIf,
+    AsyncTestCase
+)
+
 from aioresponses import CallbackResult, aioresponses
 
 
 @ddt
-class AIOResponsesTestCase(IsolatedAsyncioTestCase):
+class AIOResponsesTestCase(AsyncTestCase):
 
-    async def asyncSetUp(self):
+    async def setup(self):
         self.url = 'http://example.com/api?foo=bar#fragment'
         self.session = ClientSession()
-        self.loop = asyncio.get_event_loop()
-        super().setUp()
 
-    async def asyncTearDown(self):
+    async def teardown(self):
         close_result = self.session.close()
         if close_result is not None:
             await close_result
-        super().tearDown()
 
     def run_async(self, coroutine: Union[Coroutine, Generator]):
         return self.loop.run_until_complete(coroutine)
 
     async def request(self, url: str):
-        return (await self.session.get(url))
+        return await self.session.get(url)
 
     @data(
         hdrs.METH_HEAD,
@@ -59,6 +62,7 @@ async def request(self, url: str):
         hdrs.METH_OPTIONS,
     )
     @patch('aioresponses.aioresponses.add')
+    @fail_on(unused_loop=False)
     def test_shortcut_method(self, http_method, mocked):
         with aioresponses() as m:
             getattr(m, http_method.lower())(self.url)
@@ -194,6 +198,7 @@ async def foo(mocked):
 
         await foo()
 
+    @fail_on(unused_loop=False)
     def test_mocking_as_decorator_wrong_mocked_arg_name(self):
         @aioresponses(param='foo')
         def foo(bar):
@@ -310,7 +315,8 @@ def non_deep_copyable():
             request = m.requests[key][0]
             self.assertEqual(request.args, tuple())
             self.assertEqual(request.kwargs,
-                             {'allow_redirects': True, "data": generator_value})
+                             {'allow_redirects': True,
+                                 "data": generator_value})
 
     async def test_request_retrieval_in_case_no_response(self):
         with aioresponses() as m:
@@ -359,7 +365,9 @@ async def test_pass_through_with_origin_params(self):
         async def doit(params):
             # we have to hit actual url,
             # otherwise we do not test pass through option properly
-            ext_rep = (await self.session.get(URL(external_api), params=params))
+            ext_rep = await self.session.get(
+                URL(external_api), params=params
+            )
             return ext_rep
 
         with aioresponses(passthrough=[external_api]) as m:
@@ -475,7 +483,7 @@ async def test_exception_requests_are_tracked(self, mocked):
         self.assertEqual(request.kwargs, kwargs)
 
 
-class AIOResponsesRaiseForStatusSessionTestCase(IsolatedAsyncioTestCase):
+class AIOResponsesRaiseForStatusSessionTestCase(AsyncTestCase):
     """Test case for sessions with raise_for_status=True.
 
     This flag, introduced in aiohttp v2.0.0, automatically calls
@@ -485,17 +493,14 @@ class AIOResponsesRaiseForStatusSessionTestCase(IsolatedAsyncioTestCase):
 
     """
 
-
-    async def asyncSetUp(self):
+    async def setup(self):
         self.url = 'http://example.com/api?foo=bar#fragment'
         self.session = ClientSession(raise_for_status=True)
-        super().setUp()
 
-    async def asyncTearDown(self):
+    async def teardown(self):
         close_result = self.session.close()
         if close_result is not None:
             await close_result
-        super().tearDown()
 
     @aioresponses()
     async def test_raise_for_status(self, m):
@@ -511,22 +516,21 @@ async def test_raise_for_status(self, m):
     async def test_do_not_raise_for_status(self, m):
         m.get(self.url, status=400)
         response = await self.session.get(self.url,
-                                               raise_for_status=False)
+                                          raise_for_status=False)
 
         self.assertEqual(response.status, 400)
 
 
-class AIOResponseRedirectTest(IsolatedAsyncioTestCase):
-    async def asyncSetUp(self):
+class AIOResponseRedirectTest(AsyncTestCase):
+
+    async def setup(self):
         self.url = "http://10.1.1.1:8080/redirect"
         self.session = ClientSession()
-        super().setUp()
 
-    async def asyncTearDown(self):
+    async def teardown(self):
         close_result = self.session.close()
         if close_result is not None:
             await close_result
-        super().tearDown()
 
     @aioresponses()
     async def test_redirect_followed(self, rsps):

tox.ini

@@ -2,12 +2,8 @@
 envlist =
     flake8,
     coverage,
-    py35-aiohttp{20,21,22,23,30,31,32,33,34,35,36}
-    py36-aiohttp-master
-    py36-aiohttp{20,21,22,23,30,31,32,33,34,35,36}
-    py37-aiohttp-master
+    py36-aiohttp{30,31,32,33,34,35,36}
     py37-aiohttp{30,31,32,33,34,35,36}
-    py38-aiohttp-master
     py38-aiohttp{30,31,32,33,34,35,36}
 skipsdist = True