pyright strict compliance

Author: AbstractUmbra

mystbin/client.py

@@ -46,8 +46,7 @@ async def close(self) -> None:
 
         Closes the internal HTTP session and this client.
         """
-        if self.http._session:
-            await self.http._session.close()
+        await self.http.close()
 
     async def create_paste(
         self,
@@ -78,8 +77,8 @@ async def create_paste(
             The paste that was created.
         """
         file = File(filename=filename, content=content)
-        data = await self.http._create_paste(file=file, password=password, expires=expires)
-        return Paste._from_data(data)
+        data = await self.http.create_paste(file=file, password=password, expires=expires)
+        return Paste.from_data(data)
 
     async def create_multifile_paste(
         self, *, files: list[File], password: Optional[str] = None, expires: Optional[datetime.datetime] = None
@@ -102,8 +101,8 @@ async def create_multifile_paste(
         :class:`mystbin.Paste`
             The paste that was created.
         """
-        data = await self.http._create_paste(files=files, password=password, expires=expires)
-        return Paste._from_data(data)
+        data = await self.http.create_paste(files=files, password=password, expires=expires)
+        return Paste.from_data(data)
 
     @require_authentication
     async def delete_paste(self, paste_id: str, /) -> None:
@@ -116,7 +115,7 @@ async def delete_paste(self, paste_id: str, /) -> None:
         paste_id: :class:`str`
             The paste to delete.
         """
-        await self.http._delete_pastes(paste_ids=[paste_id])
+        await self.http.delete_pastes(paste_ids=[paste_id])
 
     @require_authentication
     async def delete_pastes(self, paste_ids: list[str], /) -> None:
@@ -129,7 +128,7 @@ async def delete_pastes(self, paste_ids: list[str], /) -> None:
         paste_ids: list[:class:`str`]
             The pastes to delete.
         """
-        await self.http._delete_pastes(paste_ids=paste_ids)
+        await self.http.delete_pastes(paste_ids=paste_ids)
 
     async def get_paste(self, paste_id: str, *, password: Optional[str] = None) -> Paste:
         """|coro|
@@ -143,8 +142,8 @@ async def get_paste(self, paste_id: str, *, password: Optional[str] = None) -> P
         password: Optional[:class:`str`]
             The password of the paste, if any.
         """
-        data = await self.http._get_paste(paste_id=paste_id, password=password)
-        return Paste._from_data(data)
+        data = await self.http.get_paste(paste_id=paste_id, password=password)
+        return Paste.from_data(data)
 
     # @overload
     # async def edit_paste(self, paste_id: str, *, new_content: str, new_filename: ..., new_expires: ...) -> None:
@@ -209,6 +208,6 @@ async def get_user_pastes(self, *, limit: int = 100) -> list[Paste]:
         list[:class:`Paste`]
             The pastes that were fetched.
         """
-        data = await self.http._get_my_pastes(limit=limit)
+        data = await self.http.get_my_pastes(limit=limit)
 
-        return [Paste._from_data(x) for x in data]
+        return [Paste.from_data(x) for x in data]

mystbin/errors.py

@@ -138,10 +138,14 @@ class HTTPClient:
     def __init__(self, *, token: Optional[str], session: Optional[aiohttp.ClientSession] = None) -> None:
         self._token: Optional[str] = token
         self._session: Optional[aiohttp.ClientSession] = session
-        self._locks: weakref.WeakValueDictionary = weakref.WeakValueDictionary()
+        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__)
 
+    async def close(self) -> None:
+        if self._session:
+            await self._session.close()
+
     async def _generate_session(self) -> aiohttp.ClientSession:
         self._session = aiohttp.ClientSession()
         return self._session
@@ -237,7 +241,7 @@ async def request(self, route: Route, **kwargs: Any) -> Any:
 
             raise RuntimeError("Unreachable code in HTTP handling.")
 
-    def _create_paste(
+    def create_paste(
         self,
         *,
         file: Optional[File] = None,
@@ -249,9 +253,9 @@ def _create_paste(
 
         json_: dict[str, Any] = {}
         if file:
-            json_["files"] = [file._to_dict()]
+            json_["files"] = [file.to_dict()]
         elif files:
-            json_["files"] = [f._to_dict() for f in files]
+            json_["files"] = [f.to_dict() for f in files]
 
         if password:
             json_["password"] = password
@@ -260,21 +264,21 @@ def _create_paste(
 
         return self.request(route=route, json=json_)
 
-    def _delete_paste(self, *, paste_id: str) -> Response[None]:
-        return self._delete_pastes(paste_ids=[paste_id])
+    def delete_paste(self, *, paste_id: str) -> Response[None]:
+        return self.delete_pastes(paste_ids=[paste_id])
 
-    def _delete_pastes(self, *, paste_ids: list[str]) -> Response[None]:
+    def delete_pastes(self, *, paste_ids: list[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: Optional[str]) -> Response[PasteResponse]:
         route = Route("GET", "/paste/{paste_id}", paste_id=paste_id)
 
         if password:
             return self.request(route=route, params={"password": password})
         return self.request(route=route)
 
-    def _edit_paste(
+    def edit_paste(
         self,
         paste_id: str,
         *,
@@ -297,7 +301,7 @@ def _edit_paste(
 
         return self.request(route, json=json_)
 
-    def _get_my_pastes(self, *, limit: int) -> Response[list[PasteResponse]]:
+    def get_my_pastes(self, *, limit: int) -> Response[list[PasteResponse]]:
         route = Route("GET", "/pastes/@me")
 
         return self.request(route, params={limit: limit})

mystbin/http.py

@@ -76,7 +76,7 @@ def character_count(self) -> int:
         return self._character_count
 
     @classmethod
-    def _from_data(cls, payload: FileResponse, /) -> Self:
+    def from_data(cls, payload: FileResponse, /) -> Self:
         self = cls(
             content=payload["content"],
             filename=payload["filename"],
@@ -86,7 +86,7 @@ def _from_data(cls, payload: FileResponse, /) -> Self:
 
         return self
 
-    def _to_dict(self) -> dict[str, Any]:
+    def to_dict(self) -> dict[str, Any]:
         ret: dict[str, Any] = {"content": self.content, "filename": self.filename}
 
         return ret
@@ -154,8 +154,8 @@ def views(self) -> Optional[int]:
         return self._views
 
     @classmethod
-    def _from_data(cls, payload: PasteResponse, /) -> Self:
-        files = [File._from_data(data) for data in payload["files"]]
+    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"],

mystbin/paste.py

@@ -40,7 +40,7 @@
 class _MissingSentinel:
     __slots__ = ()
 
-    def __eq__(self, other) -> bool:
+    def __eq__(self, other: object) -> bool:
         return False
 
     def __bool__(self) -> bool:
@@ -49,7 +49,7 @@ def __bool__(self) -> bool:
     def __hash__(self) -> int:
         return 0
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return "..."