modernise codebase

Author: AbstractUmbra

docs/conf.py

@@ -15,7 +15,6 @@
 import sys
 from typing import Dict, List, Tuple
 
-
 # from typing import Literal, Optional
 
 

mystbin/__init__.py

@@ -28,8 +28,7 @@
 
 from .client import Client as Client
 from .errors import *
-from .paste import File as File
-from .paste import Paste as Paste
+from .paste import File as File, Paste as Paste
 
 
 class VersionInfo(NamedTuple):

mystbin/client.py

@@ -22,23 +22,24 @@
 
 from __future__ import annotations
 
-import datetime
-from typing import List, Literal, Optional, Sequence, Union, overload
-
-import aiohttp
+from typing import TYPE_CHECKING, Literal, Sequence, overload
 
 from .http import HTTPClient
 from .paste import File, Paste
 from .utils import require_authentication
 
+if TYPE_CHECKING:
+    import datetime
+
+    from aiohttp import ClientSession
 
 __all__ = ("Client",)
 
 
 class Client:
     __slots__ = ("http",)
 
-    def __init__(self, *, token: Optional[str] = None, session: Optional[aiohttp.ClientSession] = None) -> None:
+    def __init__(self, *, token: str | None = None, session: ClientSession | None = None) -> None:
         self.http: HTTPClient = HTTPClient(token=token, session=session)
 
     async def close(self) -> None:
@@ -56,8 +57,8 @@ async def create_paste(
         content: str,
         file: None = ...,
         files: None = ...,
-        password: Optional[str] = ...,
-        expires: Optional[datetime.datetime] = ...,
+        password: str | None = ...,
+        expires: datetime.datetime | None = ...,
     ) -> Paste:
         ...
 
@@ -69,8 +70,8 @@ async def create_paste(
         content: None = ...,
         file: File,
         files: None = ...,
-        password: Optional[str] = ...,
-        expires: Optional[datetime.datetime] = ...,
+        password: str | None = ...,
+        expires: datetime.datetime | None = ...,
     ) -> Paste:
         ...
 
@@ -82,20 +83,20 @@ async def create_paste(
         content: None = ...,
         file: None = ...,
         files: Sequence[File],
-        password: Optional[str] = ...,
-        expires: Optional[datetime.datetime] = ...,
+        password: str | None = ...,
+        expires: datetime.datetime | None = ...,
     ) -> Paste:
         ...
 
     async def create_paste(
         self,
         *,
-        filename: Optional[str] = None,
-        content: Optional[str] = None,
-        file: Optional[File] = None,
-        files: Optional[Sequence[File]] = None,
-        password: Optional[str] = None,
-        expires: Optional[datetime.datetime] = None,
+        filename: str | None = None,
+        content: str | None = None,
+        file: File | None = None,
+        files: Sequence[File] | None = None,
+        password: str | None = None,
+        expires: datetime.datetime | None = None,
     ) -> Paste:
         """|coro|
 
@@ -162,7 +163,7 @@ async def delete_paste(self, paste_id: str, /) -> None:
         await self.http.delete_pastes(paste_ids=[paste_id])
 
     @require_authentication
-    async def delete_pastes(self, paste_ids: List[str], /) -> None:
+    async def delete_pastes(self, paste_ids: list[str], /) -> None:
         """|coro|
 
         Delete multiple pastes.
@@ -175,16 +176,14 @@ async def delete_pastes(self, paste_ids: List[str], /) -> None:
         await self.http.delete_pastes(paste_ids=paste_ids)
 
     @overload
-    async def get_paste(self, paste_id: str, *, password: Optional[str] = ..., raw: Literal[False]) -> Paste:
+    async def get_paste(self, paste_id: str, *, password: str | None = ..., raw: Literal[False]) -> Paste:
         ...
 
     @overload
-    async def get_paste(self, paste_id: str, *, password: Optional[str] = ..., raw: Literal[True]) -> list[str]:
+    async def get_paste(self, paste_id: str, *, password: str | None = ..., raw: Literal[True]) -> list[str]:
         ...
 
-    async def get_paste(
-        self, paste_id: str, *, password: Optional[str] = None, raw: bool = False
-    ) -> Union[Paste, list[str]]:
+    async def get_paste(self, paste_id: str, *, password: str | None = None, raw: bool = False) -> Paste | list[str]:
         """|coro|
 
         Fetch a paste.
@@ -210,7 +209,7 @@ async def get_paste(
         return Paste.from_data(data)
 
     @require_authentication
-    async def get_user_pastes(self, *, limit: int = 100) -> List[Paste]:
+    async def get_user_pastes(self, *, limit: int = 100) -> list[Paste]:
         """|coro|
 
         Get all pastes belonging to the current authenticated user.

mystbin/errors.py

@@ -19,8 +19,7 @@
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 """
-import aiohttp
-
+from aiohttp import ClientResponse
 
 __all__ = (
     "APIException",
@@ -29,7 +28,7 @@
 
 
 class APIException(Exception):
-    def __init__(self, *, response: aiohttp.ClientResponse, status_code: int) -> None:
+    def __init__(self, *, response: ClientResponse, status_code: int) -> None:
         self.response = response
         self.status_code = status_code
         super().__init__(self.status_code)

mystbin/http.py

@@ -33,13 +33,9 @@
     Any,
     ClassVar,
     Coroutine,
-    Dict,
     Literal,
-    Optional,
     Sequence,
-    Type,
     TypeVar,
-    Union,
 )
 from urllib.parse import quote as _uriquote
 
@@ -49,7 +45,6 @@
 from .errors import APIException
 from .utils import MISSING
 
-
 if TYPE_CHECKING:
     from types import TracebackType
 
@@ -74,7 +69,7 @@ def _clean_dt(dt: datetime.datetime) -> str:
     return dt.isoformat()
 
 
-async def json_or_text(response: aiohttp.ClientResponse, /) -> Union[Dict[str, Any], str]:
+async def json_or_text(response: aiohttp.ClientResponse, /) -> dict[str, Any] | str:
     """A quick method to parse a `aiohttp.ClientResponse` and test if it's json or text."""
     text = await response.text(encoding="utf-8")
     try:
@@ -102,9 +97,9 @@ def defer(self) -> None:
 
     def __exit__(
         self,
-        exc_type: Optional[Type[BE]],
-        exc: Optional[BE],
-        traceback: Optional[TracebackType],
+        exc_type: type[BE] | None,
+        exc: BE | None,
+        traceback: TracebackType | None,
     ) -> None:
         if self._unlock:
             self.lock.release()
@@ -137,9 +132,9 @@ class HTTPClient:
         "user_agent",
     )
 
-    def __init__(self, *, token: Optional[str], session: Optional[aiohttp.ClientSession] = None) -> None:
-        self._token: Optional[str] = token
-        self._session: Optional[aiohttp.ClientSession] = session
+    def __init__(self, *, token: str | None, session: aiohttp.ClientSession | None = None) -> None:
+        self._token: str | None = token
+        self._session: aiohttp.ClientSession | None = session
         self._locks: weakref.WeakValueDictionary[str, asyncio.Lock] = weakref.WeakValueDictionary()
         user_agent = "mystbin.py (https://github.com/PythonistaGuild/mystbin.py {0}) Python/{1[0]}.{1[1]} aiohttp/{2}"
         self.user_agent: str = user_agent.format(__version__, sys.version_info, aiohttp.__version__)
@@ -178,7 +173,7 @@ async def request(self, route: Route, **kwargs: Any) -> Any:
         LOGGER.debug("Current request headers: %s", headers)
         LOGGER.debug("Current request url: %s", route.url)
 
-        response: Optional[aiohttp.ClientResponse] = None
+        response: aiohttp.ClientResponse | None = None
         await lock.acquire()
         with MaybeUnlock(lock) as maybe_lock:
             for tries in range(5):
@@ -246,14 +241,14 @@ async def request(self, route: Route, **kwargs: Any) -> Any:
     def create_paste(
         self,
         *,
-        file: Optional[File] = None,
-        files: Optional[Sequence[File]] = None,
-        password: Optional[str],
-        expires: Optional[datetime.datetime],
+        file: File | None = None,
+        files: Sequence[File] | None = None,
+        password: str | None,
+        expires: datetime.datetime | None,
     ) -> Response[PasteResponse]:
         route = Route("PUT", "/paste")
 
-        json_: Dict[str, Any] = {}
+        json_: dict[str, Any] = {}
         if file:
             json_["files"] = [file.to_dict()]
         elif files:
@@ -273,7 +268,7 @@ def delete_pastes(self, *, paste_ids: Sequence[str]) -> Response[None]:
         route = Route("DELETE", "/paste")
         return self.request(route=route, json={"pastes": paste_ids})
 
-    def get_paste(self, *, paste_id: str, password: Optional[str]) -> Response[PasteResponse]:
+    def get_paste(self, *, paste_id: str, password: str | None) -> Response[PasteResponse]:
         route = Route("GET", "/paste/{paste_id}", paste_id=paste_id)
 
         if password:
@@ -290,7 +285,7 @@ def edit_paste(
     ) -> Response[EditPasteResponse]:
         route = Route("PATCH", "/paste/{paste_id}", paste_id=paste_id)
 
-        json_: Dict[str, Any] = {}
+        json_: dict[str, Any] = {}
 
         if new_content is not MISSING:
             json_["new_content"] = new_content

mystbin/paste.py

@@ -23,8 +23,7 @@
 from __future__ import annotations
 
 import datetime
-from typing import TYPE_CHECKING, Any, Dict, List, Optional
-
+from typing import TYPE_CHECKING, Any
 
 if TYPE_CHECKING:
     from typing_extensions import Self
@@ -59,10 +58,10 @@ class File:
         "_character_count",
     )
 
-    def __init__(self, *, filename: str, content: str, attachment_url: Optional[str] = None) -> None:
+    def __init__(self, *, filename: str, content: str, attachment_url: str | None = None) -> None:
         self.filename: str = filename
         self.content: str = content
-        self.attachment_url: Optional[str] = attachment_url
+        self.attachment_url: str | None = attachment_url
 
     @property
     def lines_of_code(self) -> int:
@@ -74,22 +73,26 @@ def character_count(self) -> int:
 
     @classmethod
     def from_data(cls, payload: FileResponse, /) -> Self:
-        self = cls(content=payload["content"], filename=payload["filename"], attachment_url=payload["attachment"])
+        self = cls(
+            content=payload["content"],
+            filename=payload["filename"],
+            attachment_url=payload["attachment"],
+        )
         self._lines_of_code = payload["loc"]
         self._character_count = payload["charcount"]
 
         return self
 
-    def to_dict(self) -> Dict[str, Any]:
-        ret: Dict[str, Any] = {"content": self.content, "filename": self.filename}
+    def to_dict(self) -> dict[str, Any]:
+        ret: dict[str, Any] = {"content": self.content, "filename": self.filename}
 
         return ret
 
 
 class Paste:
-    _last_edited: Optional[datetime.datetime]
-    _expires: Optional[datetime.datetime]
-    _views: Optional[int]
+    _last_edited: datetime.datetime | None
+    _expires: datetime.datetime | None
+    _views: int | None
 
     """Represents a Paste object from mystb.in.
 
@@ -114,11 +117,11 @@ class Paste:
         "_last_edited",
     )
 
-    def __init__(self, *, id: str, created_at: str, files: List[File], notice: Optional[str]) -> None:
+    def __init__(self, *, id: str, created_at: str, files: list[File], notice: str | None) -> None:
         self.id: str = id
         self.created_at: datetime.datetime = datetime.datetime.fromisoformat(created_at)
-        self.files: List[File] = files
-        self.notice: Optional[str] = notice
+        self.files: list[File] = files
+        self.notice: str | None = notice
 
     def __str__(self) -> str:
         return self.url
@@ -131,21 +134,26 @@ def url(self) -> str:
         return f"https://mystb.in/{self.id}"
 
     @property
-    def last_edited(self) -> Optional[datetime.datetime]:
+    def last_edited(self) -> datetime.datetime | None:
         return self._last_edited
 
     @property
-    def expires(self) -> Optional[datetime.datetime]:
+    def expires(self) -> datetime.datetime | None:
         return self._expires
 
     @property
-    def views(self) -> Optional[int]:
+    def views(self) -> int | None:
         return self._views
 
     @classmethod
     def from_data(cls, payload: PasteResponse, /) -> Self:
         files = [File.from_data(data) for data in payload["files"]]
-        self = cls(id=payload["id"], created_at=payload["created_at"], files=files, notice=payload["notice"])
+        self = cls(
+            id=payload["id"],
+            created_at=payload["created_at"],
+            files=files,
+            notice=payload.get("notice"),
+        )
         self._views = payload.get("views")
         last_edited = payload.get("last_edited")
         if last_edited: