Drop raises_regexp usage

requirements-dev.txt

@@ -13,7 +13,6 @@ pyenchant
 sphinxcontrib-newsfeed
 pytest
 pytest-cov
-pytest-raisesregexp
 gunicorn
 pygments
 -e .

tests/test_client_request.py

@@ -2,23 +2,22 @@
 
 import asyncio
 import gc
-import unittest
-import unittest.mock
-
 import inspect
 import io
+import re
+import unittest
+import unittest.mock
 import urllib.parse
-import os.path
 import zlib
-
 from http.cookies import SimpleCookie
 
 import pytest
-
 import aiohttp
-from aiohttp.client_reqrep import ClientRequest, ClientResponse
-from aiohttp.multidict import upstr, CIMultiDict, CIMultiDictProxy
 from aiohttp import BaseConnector
+from aiohttp.client_reqrep import ClientRequest, ClientResponse
+from aiohttp.multidict import CIMultiDict, CIMultiDictProxy, upstr
+
+import os.path
 
 
 @pytest.yield_fixture
@@ -381,9 +380,9 @@ def test_query_str_param(make_request):
 
 def test_query_bytes_param_raises(make_request):
     for meth in ClientRequest.ALL_METHODS:
-        with pytest.raises_regexp(TypeError,
-                                  'not a valid non-string.*or mapping'):
+        with pytest.raises(TypeError) as ctx:
             make_request(meth, 'http://python.org', params=b'test=foo')
+        assert re.match('not a valid non-string.*or mapping', str(ctx.value))
 
 
 def test_query_str_param_is_not_encoded(make_request):

tests/test_client_session.py

@@ -1,14 +1,15 @@
 import asyncio
 import contextlib
 import gc
-import pytest
+import re
 import types
 from unittest import mock
 
 import aiohttp
+import pytest
 from aiohttp.client import ClientSession
-from aiohttp.multidict import MultiDict, CIMultiDict
 from aiohttp.connector import BaseConnector, TCPConnector
+from aiohttp.multidict import CIMultiDict, MultiDict
 
 
 @pytest.fixture
@@ -266,10 +267,10 @@ def test_connector_loop(loop):
         stack.enter_context(contextlib.closing(another_loop))
         connector = TCPConnector(loop=another_loop)
         stack.enter_context(contextlib.closing(connector))
-        with pytest.raises_regexp(
-                ValueError,
-                "loop argument must agree with connector"):
+        with pytest.raises(ValueError) as ctx:
             ClientSession(connector=connector, loop=loop)
+        assert re.match("loop argument must agree with connector",
+                        str(ctx.value))
 
 
 def test_cookies_are_readonly(session):

tests/test_web_response.py

@@ -210,10 +210,10 @@ def test_chunked_encoding_forbidden_for_http_10():
     resp = StreamResponse()
     resp.enable_chunked_encoding()
 
-    with pytest.raises_regexp(
-            RuntimeError,
-            "Using chunked encoding is forbidden for HTTP/1.0"):
+    with pytest.raises(RuntimeError) as ctx:
         yield from resp.prepare(req)
+    assert re.match("Using chunked encoding is forbidden for HTTP/1.0",
+                    str(ctx.value))
 
 
 @pytest.mark.run_loop