Update ruff and resolve issues

Author: bboe

.pre-commit-config.yaml

@@ -29,11 +29,7 @@ repos:
       - id: ruff
         args: [ --exit-non-zero-on-fix, --fix ]
         files: ^(prawcore/.*.py)$
-
-  - repo: https://github.com/psf/black
-    hooks:
-      - id: black
-    rev: 24.10.0
+      - id: ruff-format
 
   - repo: https://github.com/LilSpazJoekp/docstrfmt
     hooks:

README.rst

@@ -35,10 +35,6 @@ prawcore
     :alt: pre-commit
     :target: https://github.com/pre-commit/pre-commit
 
-.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :alt: Black code style
-    :target: https://github.com/psf/black
-
 prawcore is a low-level communication layer used by PRAW 4+.
 
 Installation

examples/obtain_refresh_token.py

@@ -9,6 +9,7 @@
 application OAuth2 credentials.
 
 """
+
 import os
 import random
 import socket

examples/read_only_auth_trophies.py

@@ -6,6 +6,7 @@
 require an access token to make authenticated requests to Reddit.
 
 """
+
 import os
 import sys
 

examples/script_auth_friend_list.py

@@ -7,6 +7,7 @@
 password.
 
 """
+
 import os
 import sys
 

prawcore/__init__.py

@@ -1,4 +1,4 @@
-""""Low-level communication layer for PRAW 4+."""
+"""Low-level communication layer for PRAW 4+."""
 
 import logging
 

prawcore/const.py

@@ -7,7 +7,8 @@
 REVOKE_TOKEN_PATH = "/api/v1/revoke_token"  # noqa: S105
 TIMEOUT = float(
     os.environ.get(
-        "PRAWCORE_TIMEOUT", os.environ.get("prawcore_timeout", 16)  # noqa: SIM112
+        "PRAWCORE_TIMEOUT",
+        os.environ.get("prawcore_timeout", 16),  # noqa: SIM112
     )
 )
 WINDOW_SIZE = 600

prawcore/rate_limit.py

@@ -4,9 +4,11 @@
 
 import logging
 import time
-from typing import TYPE_CHECKING, Any, Callable, Mapping
+from typing import TYPE_CHECKING, Any, Callable
 
 if TYPE_CHECKING:
+    from collections.abc import Mapping
+
     from requests.models import Response
 
 log = logging.getLogger(__package__)

prawcore/sessions.py

@@ -205,11 +205,8 @@ def _make_request(
             )
             return response, None
         except RequestException as exception:
-            if (
-                not retry_strategy_state.should_retry_on_failure()
-                or not isinstance(  # noqa: E501
-                    exception.original_exception, self.RETRY_EXCEPTIONS
-                )
+            if not retry_strategy_state.should_retry_on_failure() or not isinstance(  # noqa: E501
+                exception.original_exception, self.RETRY_EXCEPTIONS
             ):
                 raise
             return None, exception.original_exception
@@ -266,9 +263,9 @@ def _request_with_retries(
             raise self.STATUS_EXCEPTIONS[response.status_code](response)
         if response.status_code == codes["no_content"]:
             return None
-        assert (
-            response.status_code in self.SUCCESS_STATUSES
-        ), f"Unexpected status code: {response.status_code}"
+        assert response.status_code in self.SUCCESS_STATUSES, (
+            f"Unexpected status code: {response.status_code}"
+        )
         if response.headers.get("content-length") == "0":
             return ""
         try:

pre_push.py

@@ -64,7 +64,7 @@ def main():
         "-n",
         "--unstatic",
         action="store_true",
-        help="Do not run static tests (black/flake8/pydocstyle)",
+        help="Do not run static tests (ruff)",
         default=False,
     )
     parser.add_argument(

pyproject.toml

@@ -40,7 +40,7 @@ dev = [
 ]
 lint = [
   "pre-commit",
-  "ruff ==0.1.*"
+  "ruff ==0.9.*"
 ]
 test = [
   "betamax >=0.8, <0.9",
@@ -52,14 +52,6 @@ test = [
 "Issue Tracker" = "https://github.com/praw-dev/prawcore/issues"
 "Source Code" = "https://github.com/praw-dev/prawcore"
 
-[tool.black]
-extend_exclude = '/(\.venv.*)/'
-line-length = 88
-
-[tool.isort]
-profile = 'black'
-skip_glob = '.venv*'
-
 [tool.ruff]
 target-version = "py39"
 include = [

tools/set_version.py

@@ -25,7 +25,7 @@ def add_unreleased_to_changelog():
         return False
 
     with open("CHANGES.rst", "w") as fp:
-        fp.write(f"{new_header}{content[len(CHANGELOG_HEADER):]}")
+        fp.write(f"{new_header}{content[len(CHANGELOG_HEADER) :]}")
     return True
 
 
@@ -84,7 +84,7 @@ def update_changelog(version):
     version_header = f"{version_line}{'-' * len(version_line[:-1])}\n\n"
 
     with open("CHANGES.rst", "w") as fp:
-        fp.write(f"{CHANGELOG_HEADER}{version_header}{content[len(expected_header):]}")
+        fp.write(f"{CHANGELOG_HEADER}{version_header}{content[len(expected_header) :]}")
     return True