API refactor

venv/lib/python3.12/site-packages/aiofiles/base.py

@@ -1,6 +1,6 @@
 """Various base classes."""
-from types import coroutine
-from collections.abc import Coroutine
+from collections.abc import Awaitable
+from contextlib import AbstractAsyncContextManager
 from asyncio import get_running_loop
 
 
@@ -45,66 +45,22 @@ class AsyncIndirectBase(AsyncBase):
         pass  # discard writes
 
 
-class _ContextManager(Coroutine):
+class AiofilesContextManager(Awaitable, AbstractAsyncContextManager):
+    """An adjusted async context manager for aiofiles."""
+
     __slots__ = ("_coro", "_obj")
 
     def __init__(self, coro):
         self._coro = coro
         self._obj = None
 
-    def send(self, value):
-        return self._coro.send(value)
-
-    def throw(self, typ, val=None, tb=None):
-        if val is None:
-            return self._coro.throw(typ)
-        elif tb is None:
-            return self._coro.throw(typ, val)
-        else:
-            return self._coro.throw(typ, val, tb)
-
-    def close(self):
-        return self._coro.close()
-
-    @property
-    def gi_frame(self):
-        return self._coro.gi_frame
-
-    @property
-    def gi_running(self):
-        return self._coro.gi_running
-
-    @property
-    def gi_code(self):
-        return self._coro.gi_code
-
-    def __next__(self):
-        return self.send(None)
-
-    @coroutine
-    def __iter__(self):
-        resp = yield from self._coro
-        return resp
-
     def __await__(self):
-        resp = yield from self._coro
-        return resp
-
-    async def __anext__(self):
-        resp = await self._coro
-        return resp
-
-    async def __aenter__(self):
-        self._obj = await self._coro
+        if self._obj is None:
+            self._obj = yield from self._coro.__await__()
         return self._obj
 
-    async def __aexit__(self, exc_type, exc, tb):
-        self._obj.close()
-        self._obj = None
-
-
-class AiofilesContextManager(_ContextManager):
-    """An adjusted async context manager for aiofiles."""
+    async def __aenter__(self):
+        return await self
 
     async def __aexit__(self, exc_type, exc_val, exc_tb):
         await get_running_loop().run_in_executor(

venv/lib/python3.12/site-packages/aiofiles/os.py

@@ -1,4 +1,5 @@
 """Async executor versions of file functions from the os module."""
+
 import os
 
 from . import ospath as path
@@ -7,7 +8,6 @@ from .ospath import wrap
 __all__ = [
     "path",
     "stat",
-    "statvfs",
     "rename",
     "renames",
     "replace",
@@ -17,15 +17,20 @@ __all__ = [
     "makedirs",
     "rmdir",
     "removedirs",
-    "link",
     "symlink",
     "readlink",
     "listdir",
     "scandir",
     "access",
-    "sendfile",
     "wrap",
+    "getcwd",
 ]
+if hasattr(os, "link"):
+    __all__ += ["link"]
+if hasattr(os, "sendfile"):
+    __all__ += ["sendfile"]
+if hasattr(os, "statvfs"):
+    __all__ += ["statvfs"]
 
 
 stat = wrap(os.stat)
@@ -38,13 +43,15 @@ mkdir = wrap(os.mkdir)
 makedirs = wrap(os.makedirs)
 rmdir = wrap(os.rmdir)
 removedirs = wrap(os.removedirs)
-link = wrap(os.link)
 symlink = wrap(os.symlink)
 readlink = wrap(os.readlink)
 listdir = wrap(os.listdir)
 scandir = wrap(os.scandir)
 access = wrap(os.access)
+getcwd = wrap(os.getcwd)
 
+if hasattr(os, "link"):
+    link = wrap(os.link)
 if hasattr(os, "sendfile"):
     sendfile = wrap(os.sendfile)
 if hasattr(os, "statvfs"):

venv/lib/python3.12/site-packages/aiofiles/ospath.py

@@ -1,4 +1,5 @@
 """Async executor versions of file functions from the os.path module."""
+
 import asyncio
 from functools import partial, wraps
 from os import path
@@ -26,3 +27,4 @@ getatime = wrap(path.getatime)
 getctime = wrap(path.getctime)
 samefile = wrap(path.samefile)
 sameopenfile = wrap(path.sameopenfile)
+abspath = wrap(path.abspath)

venv/lib/python3.12/site-packages/aiofiles/threadpool/__init__.py

@@ -10,7 +10,6 @@ from io import (
     FileIO,
     TextIOBase,
 )
-from types import coroutine
 
 from ..base import AiofilesContextManager
 from .binary import (
@@ -63,8 +62,7 @@ def open(
     )
 
 
-@coroutine
-def _open(
+async def _open(
     file,
     mode="r",
     buffering=-1,
@@ -91,7 +89,7 @@ def _open(
         closefd=closefd,
         opener=opener,
     )
-    f = yield from loop.run_in_executor(executor, cb)
+    f = await loop.run_in_executor(executor, cb)
 
     return wrap(f, loop=loop, executor=executor)