Replace requests with python-httpx

le717 · Jun 8, 2024 · c3f1569 · c3f1569
1 parent ae24075
commit c3f1569
Show file tree

Hide file tree

Showing 6 changed files with 106 additions and 157 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -8,6 +8,7 @@ _Released TDB_
 - Update minimum Python version to 3.11
 - Update to Flask v3
 - ~~Update SQLAlchemy to v2~~ _update pending_
+- Replace `requests` with `python-httpx`
 - Update all dependencies to their latest versions
 - Switch to ruff for linting and formatting
 

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
 
 ### Auto-embed JavaScript
 
-Starting with version v1.3.0, TODO: write me!
+Starting with version 1.3.0, TODO: write me!
 
 ## Required Secrets
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -13,9 +13,9 @@ sys-vars = "^5.0.0"
 gunicorn = "^22.0.0"
 sqlalchemy = "^1.4.44"
 flask-sqlalchemy = "^3.0.2"
-requests = "^2.32.3"
 flask-cors = "^4.0.1"
 flask-db = "^0.4.1"
+httpx = "^0.27.0"
 
 [tool.poetry.group.dev]
 

diff --git a/src/core/database/linkrot.py b/src/core/database/linkrot.py
@@ -1,12 +1,11 @@
 from typing import Literal, TypedDict
 
-import requests
+import httpx
 import sys_vars
 
-from src.core.logger import LINKROT
 from src.core.database import weblink
 from src.core.database.schema import RottedLinks, WebLink, db
-
+from src.core.logger import LINKROT
 
 __all__ = ["check_all", "check_one", "delete"]
 
@@ -26,20 +25,20 @@ class RotResult(TypedDict):
 def __ping_url(url: str) -> bool:
     """Check a link for rotting."""
     try:
-        r = requests.head(url)
+        r = httpx.head(url)
         return r.status_code in (
-            requests.codes.ok,
-            requests.codes.created,
-            requests.codes.no_content,
-            requests.codes.not_modified,
+            httpx.codes.OK,
+            httpx.codes.CREATED,
+            httpx.codes.NO_CONTENT,
+            httpx.codes.NOT_MODIFIED,
         )
     except Exception:
         return False
 
 
 def __ping_wayback_machine(url: str) -> Literal[False] | str:
     """Check the Web Archive for an archived URL."""
-    r = requests.get(f"https://archive.org/wayback/available?url={url}").json()
+    r = httpx.get(f"https://archive.org/wayback/available?url={url}").json()
     if not r["archived_snapshots"]:
         return False
     return r["archived_snapshots"]["closest"]["url"]

diff --git a/src/core/logger.py b/src/core/logger.py
@@ -1,12 +1,11 @@
-from datetime import datetime
 import logging
+from datetime import datetime
 from logging.handlers import RotatingFileHandler
 from pathlib import Path
 
-from flask import request
-import requests
+import httpx
 import sys_vars
-
+from flask import request
 
 __all__ = ["LINKROT", "DiscordHandler", "file_handler"]
 
@@ -39,7 +38,7 @@ def format(self, record: logging.LogRecord) -> dict:
         return {"content": _linkrot_formatter(record)}
 
     def emit(self, record: logging.LogRecord) -> logging.LogRecord:
-        requests.post(
+        httpx.post(
             self.url,
             headers={"Content-type": "application/json"},
             json=self.format(record),