Merge pull request #244 from praw-dev/fix-lint-errors

Fix linting errors

Author: LilSpazJoekp

prawcore/const.py

@@ -9,7 +9,7 @@
 TIMEOUT = float(
     os.environ.get(
         "PRAWCORE_TIMEOUT",
-        os.environ.get("prawcore_timeout", 16),  # noqa: SIM112
+        os.environ.get("prawcore_timeout", "16"),  # noqa: SIM112
     )
 )
 WINDOW_SIZE = 600

prawcore/requestor.py

@@ -47,7 +47,7 @@ def __init__(
 
         """
         # Imported locally to avoid an import cycle, with __init__
-        from . import __version__
+        from . import __version__  # noqa: PLC0415
 
         if user_agent is None or len(user_agent) < self.MIN_USER_AGENT_LENGTH:
             msg = "user_agent is not descriptive"

tests/conftest.py

@@ -64,10 +64,17 @@ def __init__(self, _dict):
 
 placeholders = {
     x: env_default(x)
-    for x in (
-        "client_id client_secret password permanent_grant_code temporary_grant_code"
-        " redirect_uri refresh_token user_agent username"
-    ).split()
+    for x in [
+        "client_id",
+        "client_secret",
+        "password",
+        "permanent_grant_code",
+        "temporary_grant_code",
+        "redirect_uri",
+        "refresh_token",
+        "user_agent",
+        "username",
+    ]
 }
 
 if (
@@ -76,9 +83,8 @@ def __init__(self, _dict):
     placeholders["basic_auth"] = b64encode(f"{placeholders['client_id']}:".encode()).decode("utf-8")
 else:
     placeholders["basic_auth"] = b64encode(
-        f"{placeholders['client_id']}:{placeholders['client_secret']}".encode()
+        f"{placeholders['client_id']}:{placeholders['client_secret']}".encode(),
     ).decode("utf-8")
 
-
 if platform == "darwin":  # Work around issue with betamax on OS X  # pragma: no cover
     socket.gethostbyname = lambda _: "127.0.0.1"

tests/integration/__init__.py

@@ -1,6 +1,7 @@
 """prawcore Integration test suite."""
 
 import os
+from pathlib import Path
 from urllib.parse import quote_plus
 
 import betamax
@@ -13,7 +14,7 @@
     filter_access_token,
 )
 
-CASSETTES_PATH = "tests/integration/cassettes"
+CASSETTES_PATH = Path("tests/integration/cassettes")
 existing_cassettes = set()
 used_cassettes = set()
 
@@ -24,8 +25,8 @@ class IntegrationTest:
     @pytest.fixture(autouse=True, scope="session")
     def cassette_tracker(self):  # pragma: no cover
         """Track cassettes to ensure unused cassettes are not uploaded."""
-        for cassette in os.listdir(CASSETTES_PATH):
-            existing_cassettes.add(cassette[: cassette.rindex(".")])
+        for cassette in CASSETTES_PATH.iterdir():
+            existing_cassettes.add(cassette.name[: cassette.name.rindex(".")])
         yield
         unused_cassettes = existing_cassettes - used_cassettes
         if unused_cassettes and os.getenv("ENSURE_NO_UNUSED_CASSETTES", "0") == "1":
@@ -42,16 +43,16 @@ def cassette(self, request, recorder, cassette_name):
                 #  before class markers.
                 kwargs.setdefault(key, value)
         with recorder.use_cassette(cassette_name, **kwargs) as recorder_context:
-            cassette = recorder_context.current_cassette
+            _cassette = recorder_context.current_cassette
             yield recorder_context
-            ensure_integration_test(cassette)
+            ensure_integration_test(_cassette)
             used_cassettes.add(cassette_name)
 
     @pytest.fixture(autouse=True)
     def recorder(self, requestor):
         """Configure Betamax."""
-        recorder = betamax.Betamax(requestor)
-        recorder.register_serializer(PrettyJSONSerializer)
+        _recorder = betamax.Betamax(requestor)
+        _recorder.register_serializer(PrettyJSONSerializer)
         with betamax.Betamax.configure() as config:
             config.cassette_library_dir = CASSETTES_PATH
             config.default_cassette_options["serialize_with"] = "prettyjson"
@@ -60,7 +61,7 @@ def recorder(self, requestor):
                 if key == "password":
                     value = quote_plus(value)  # noqa: PLW2901
                 config.define_cassette_placeholder(f"<{key.upper()}>", value)
-            yield recorder
+            yield _recorder
             # since placeholders persist between tests
             Cassette.default_cassette_options["placeholders"] = []