Use ruff as linter

tests/integration/test_aiohttp.py

@@ -7,9 +7,9 @@ import pytest
 asyncio = pytest.importorskip("asyncio")
 aiohttp = pytest.importorskip("aiohttp")
 
-import vcr  # noqa: E402
+import vcr
 
-from .aiohttp_utils import aiohttp_app, aiohttp_request  # noqa: E402
+from .aiohttp_utils import aiohttp_app, aiohttp_request
 
 
 def run_in_loop(fn):
@@ -278,9 +278,7 @@ def test_redirect(tmpdir, mockbin):
     # looking request_info.
     assert cassette_response.request_info.url == response.request_info.url
     assert cassette_response.request_info.method == response.request_info.method
-    assert {k: v for k, v in cassette_response.request_info.headers.items()} == {
-        k: v for k, v in response.request_info.headers.items()
-    }
+    assert dict(cassette_response.request_info.headers.items()) == dict(response.request_info.headers.items())
     assert cassette_response.request_info.real_url == response.request_info.real_url
 
 
@@ -351,7 +349,10 @@ def test_cookies(httpbin_both, httpbin_ssl_context, tmpdir):
             async with aiohttp.ClientSession(loop=loop, cookie_jar=aiohttp.CookieJar(unsafe=True)) as session:
                 cookies_resp = await session.get(cookies_url, ssl=httpbin_ssl_context)
                 home_resp = await session.get(
-                    home_url, cookies=req_cookies, headers=req_headers, ssl=httpbin_ssl_context
+                    home_url,
+                    cookies=req_cookies,
+                    headers=req_headers,
+                    ssl=httpbin_ssl_context,
                 )
                 assert cassette.play_count == 0
         assert_responses(cookies_resp, home_resp)
@@ -361,7 +362,10 @@ def test_cookies(httpbin_both, httpbin_ssl_context, tmpdir):
             async with aiohttp.ClientSession(loop=loop, cookie_jar=aiohttp.CookieJar(unsafe=True)) as session:
                 cookies_resp = await session.get(cookies_url, ssl=httpbin_ssl_context)
                 home_resp = await session.get(
-                    home_url, cookies=req_cookies, headers=req_headers, ssl=httpbin_ssl_context
+                    home_url,
+                    cookies=req_cookies,
+                    headers=req_headers,
+                    ssl=httpbin_ssl_context,
                 )
                 assert cassette.play_count == 2
         assert_responses(cookies_resp, home_resp)
@@ -407,7 +411,7 @@ def test_cookies_redirect(httpbin_both, httpbin_ssl_context, tmpdir):
         # Assert that it's ignoring expiration date
         with vcr.use_cassette(tmp, record_mode=vcr.mode.NONE) as cassette:
             cassette.responses[0]["headers"]["set-cookie"] = [
-                "Cookie_1=Val_1; Expires=Wed, 21 Oct 2015 07:28:00 GMT"
+                "Cookie_1=Val_1; Expires=Wed, 21 Oct 2015 07:28:00 GMT",
             ]
             async with aiohttp.ClientSession(loop=loop, cookie_jar=aiohttp.CookieJar(unsafe=True)) as session:
                 cookies_resp = await session.get(cookies_url, ssl=httpbin_ssl_context)

tests/integration/test_boto.py

@@ -2,14 +2,14 @@ import pytest
 
 boto = pytest.importorskip("boto")
 
-from configparser import DuplicateSectionError  # NOQA
+from configparser import DuplicateSectionError
 
-import boto  # NOQA
-import boto.iam  # NOQA
-from boto.s3.connection import S3Connection  # NOQA
-from boto.s3.key import Key  # NOQA
+import boto
+import boto.iam
+from boto.s3.connection import S3Connection
+from boto.s3.key import Key
 
-import vcr  # NOQA
+import vcr
 
 
 def test_boto_stubs(tmpdir):

tests/integration/test_boto3.py

@@ -4,13 +4,13 @@ import pytest
 
 boto3 = pytest.importorskip("boto3")
 
-import boto3  # NOQA
-import botocore  # NOQA
+import boto3
+import botocore
 
-import vcr  # NOQA
+import vcr
 
 try:
-    from botocore import awsrequest  # NOQA
+    from botocore import awsrequest
 
     botocore_awsrequest = True
 except ImportError:

tests/integration/test_httpx.py

@@ -5,8 +5,8 @@ import pytest
 asyncio = pytest.importorskip("asyncio")
 httpx = pytest.importorskip("httpx")
 
-import vcr  # noqa: E402
-from vcr.stubs.httpx_stubs import HTTPX_REDIRECT_PARAM  # noqa: E402
+import vcr
+from vcr.stubs.httpx_stubs import HTTPX_REDIRECT_PARAM
 
 
 class BaseDoRequest:
@@ -185,9 +185,7 @@ def test_redirect(mockbin, yml, do_request):
     # looking request_info.
     assert cassette_response.request.url == response.request.url
     assert cassette_response.request.method == response.request.method
-    assert {k: v for k, v in cassette_response.request.headers.items()} == {
-        k: v for k, v in response.request.headers.items()
-    }
+    assert dict(cassette_response.request.headers.items()) == dict(response.request.headers.items())
 
 
 @pytest.mark.online
@@ -242,10 +240,10 @@ def test_behind_proxy(do_request):
 @pytest.mark.online
 def test_cookies(tmpdir, mockbin, do_request):
     def client_cookies(client):
-        return [c for c in client.client.cookies]
+        return list(client.client.cookies)
 
     def response_cookies(response):
-        return [c for c in response.cookies]
+        return list(response.cookies)
 
     url = mockbin + "/bin/26148652-fe25-4f21-aaf5-689b5b4bf65f"
     headers = {"cookie": "k1=v1;k2=v2"}

tests/integration/test_matchers.py

@@ -72,7 +72,12 @@ def test_method_matcher(cassette, httpbin, httpbin_secure):
 
 
 @pytest.mark.parametrize(
-    "uri", [DEFAULT_URI, "http://httpbin.org/get?p2=q2&p1=q1", "http://httpbin.org/get?p2=q2&p1=q1"]
+    "uri",
+    (
+        DEFAULT_URI,
+        "http://httpbin.org/get?p2=q2&p1=q1",
+        "http://httpbin.org/get?p2=q2&p1=q1",
+    ),
 )
 def test_default_matcher_matches(cassette, uri, httpbin, httpbin_secure):
     uri = _replace_httpbin(uri, httpbin, httpbin_secure)

tests/integration/test_requests.py

@@ -5,7 +5,7 @@ from assertions import assert_cassette_empty, assert_is_json_bytes
 import vcr
 
 requests = pytest.importorskip("requests")
-from requests.exceptions import ConnectionError  # noqa E402
+from requests.exceptions import ConnectionError  # E402
 
 
 def test_status_code(httpbin_both, tmpdir):
@@ -171,7 +171,8 @@ def test_gzip__decode_compressed_response_true(tmpdir, httpbin_both):
     assert expected_response.headers["content-encoding"] == "gzip"  # self-test
 
     with vcr.use_cassette(
-        str(tmpdir.join("decode_compressed.yaml")), decode_compressed_response=True
+        str(tmpdir.join("decode_compressed.yaml")),
+        decode_compressed_response=True,
     ) as cassette:
         r = requests.get(url)
         assert r.headers["content-encoding"] == "gzip"  # i.e. not removed

tests/integration/test_tornado.py

@@ -242,7 +242,10 @@ def test_unsupported_features_raise_error_disabled(get_client, tmpdir):
 
     with vcr.use_cassette(str(tmpdir.join("invalid.yaml"))):
         response = yield get(
-            get_client(), "http://httpbin.org", streaming_callback=callback, raise_error=False
+            get_client(),
+            "http://httpbin.org",
+            streaming_callback=callback,
+            raise_error=False,
         )
 
     assert "not yet supported by VCR" in str(response.error)

tests/integration/test_urllib3.py

@@ -16,7 +16,8 @@ urllib3 = pytest.importorskip("urllib3")
 @pytest.fixture(scope="module")
 def verify_pool_mgr():
     return urllib3.PoolManager(
-        cert_reqs="CERT_REQUIRED", ca_certs=pytest_httpbin.certs.where()  # Force certificate check.
+        cert_reqs="CERT_REQUIRED",
+        ca_certs=pytest_httpbin.certs.where(),  # Force certificate check.
     )
 
 

tests/integration/test_wild.py

@@ -7,7 +7,7 @@ import pytest
 
 requests = pytest.importorskip("requests")
 
-import vcr  # NOQA
+import vcr
 
 
 def test_domain_redirect():