python-filewrap 0.2.8.1__tar.gz → 0.2.9__tar.gz

{python_filewrap-0.2.8.1 → python_filewrap-0.2.9}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: python-filewrap
-Version: 0.2.8.1
+Version: 0.2.9
 Summary: Python file wrappers.
-Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-filewrap
+Home-page: https://github.com/ChenyangGao/python-modules/tree/main/python-filewrap
 License: MIT
 Keywords: file,wrapper
 Author: ChenyangGao
@@ -20,9 +20,9 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: python-asynctools (>=0.1)
+Requires-Dist: python-asynctools (>=0.1.3)
 Requires-Dist: python-property (>=0.0.3)
-Project-URL: Repository, https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-filewrap
+Project-URL: Repository, https://github.com/ChenyangGao/python-modules/tree/main/python-filewrap
 Description-Content-Type: text/markdown
 
 # Python file wrappers.

{python_filewrap-0.2.8.1 → python_filewrap-0.2.9}/filewrap/__init__.py

@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 2, 8)
+__version__ = (0, 2, 9)
 __all__ = [
     "SupportsRead", "SupportsReadinto", "SupportsWrite", "SupportsSeek", 
     "AsyncBufferedReader", "AsyncTextIOWrapper", "buffer_length", 
@@ -31,8 +31,7 @@ from asynctools import async_chain, ensure_async, ensure_aiter, run_async
 from property import funcproperty
 
 
-READ_BUFSIZE = 1 << 13
-WRITE_BUFSIZE = 1 << 16
+READ_BUFSIZE = 1 << 16
 CRE_NOT_UNIX_NEWLINES: Final = re_compile("\r\n|\r")
 
 
@@ -46,7 +45,7 @@ class VirtualBufferedReader:
 
 @runtime_checkable
 class SupportsRead[T](Protocol):
-    def read(self, /, size: int) -> T: ...
+    def read(self, /, size: int = -1) -> T: ...
 
 
 @runtime_checkable
@@ -827,17 +826,16 @@ def get_bom(encoding: str, /) -> bytes:
 
 
 def buffer_length(b: Buffer, /) -> int:
-    try:
-        return len(b) # type: ignore
-    except:
-        return len(memoryview(b))
+    if isinstance(b, (bytes, bytearray, memoryview)):
+        return len(b)
+    return len(memoryview(b))
 
 
 def bio_chunk_iter(
     bio: SupportsRead[Buffer] | SupportsReadinto | Callable[[int], Buffer], 
     /, 
     size: int = -1, 
-    chunksize: int = WRITE_BUFSIZE, 
+    chunksize: int = READ_BUFSIZE, 
     can_buffer: bool = False, 
     callback: None | Callable[[int], Any] = None, 
 ) -> Iterator[Buffer]:
@@ -866,6 +864,8 @@ def bio_chunk_iter(
                 if size < chunksize:
                     del buf[size:]
                 length = readinto(buf)
+                if not length:
+                    return
                 if callback:
                     callback(length)
                 if length < buffer_length(buf):
@@ -889,6 +889,8 @@ def bio_chunk_iter(
                 readsize = min(chunksize, size)
                 chunk = read(readsize)
                 length = buffer_length(chunk)
+                if not length:
+                    return
                 if callback:
                     callback(length)
                 yield chunk
@@ -906,7 +908,7 @@ async def bio_chunk_async_iter(
     bio: SupportsRead[Buffer] | SupportsRead[Awaitable[Buffer]] | SupportsReadinto | Callable[[int], Buffer] | Callable[[int], Awaitable[Buffer]], 
     /, 
     size: int = -1, 
-    chunksize: int = WRITE_BUFSIZE, 
+    chunksize: int = READ_BUFSIZE, 
     can_buffer: bool = False, 
     callback: None | Callable[[int], Any] = None, 
 ) -> AsyncIterator[Buffer]:
@@ -934,6 +936,8 @@ async def bio_chunk_async_iter(
                 if size < chunksize:
                     del buf[size:]
                 length = await readinto(buf)
+                if not length:
+                    return
                 if callback:
                     await callback(length)
                 if length < buffer_length(buf):
@@ -957,6 +961,8 @@ async def bio_chunk_async_iter(
                 readsize = min(chunksize, size)
                 chunk = await read(readsize)
                 length = buffer_length(chunk)
+                if not length:
+                    return
                 if callback:
                     await callback(length)
                 yield chunk
@@ -974,7 +980,7 @@ def bio_skip_iter(
     bio: SupportsRead[Buffer] | SupportsReadinto | Callable[[int], Buffer], 
     /, 
     size: int = -1, 
-    chunksize: int = WRITE_BUFSIZE, 
+    chunksize: int = READ_BUFSIZE, 
     callback: None | Callable[[int], Any] = None, 
 ) -> Iterator[int]:
     if size == 0:
@@ -990,7 +996,7 @@ def bio_skip_iter(
             length = seek(0, 2) - curpos
     except Exception:
         if chunksize <= 0:
-            chunksize = WRITE_BUFSIZE
+            chunksize = READ_BUFSIZE
         if callable(bio):
             read = bio
         elif hasattr(bio, "readinto"):
@@ -1045,7 +1051,7 @@ async def bio_skip_async_iter(
     bio: SupportsRead[Buffer] | SupportsRead[Awaitable[Buffer]] | SupportsReadinto | Callable[[int], Buffer] | Callable[[int], Awaitable[Buffer]], 
     /, 
     size: int = -1, 
-    chunksize: int = WRITE_BUFSIZE, 
+    chunksize: int = READ_BUFSIZE, 
     callback: None | Callable[[int], Any] = None, 
 ) -> AsyncIterator[int]:
     if size == 0:
@@ -1061,7 +1067,7 @@ async def bio_skip_async_iter(
             length = (await seek(0, 2)) - curpos
     except Exception:
         if chunksize <= 0:
-            chunksize = WRITE_BUFSIZE
+            chunksize = READ_BUFSIZE
         if callable(bio):
             read: Callable[[int], Awaitable[Buffer]] = ensure_async(bio, threaded=True)
         elif hasattr(bio, "readinto"):
@@ -1558,7 +1564,7 @@ def bytes_iter_to_async_reader(
 def bytes_to_chunk_iter(
     b: Buffer, 
     /, 
-    chunksize: int = WRITE_BUFSIZE, 
+    chunksize: int = READ_BUFSIZE, 
 ) -> Iterator[memoryview]:
     m = memoryview(b)
     for i in range(0, buffer_length(m), chunksize):
@@ -1568,7 +1574,7 @@ def bytes_to_chunk_iter(
 async def bytes_to_chunk_async_iter(
     b: Buffer, 
     /, 
-    chunksize: int = WRITE_BUFSIZE, 
+    chunksize: int = READ_BUFSIZE, 
 ) -> AsyncIterator[memoryview]:
     m = memoryview(b)
     for i in range(0, buffer_length(m), chunksize):
@@ -1578,7 +1584,7 @@ async def bytes_to_chunk_async_iter(
 def bytes_ensure_part_iter(
     it: Iterable[Buffer], 
     /, 
-    partsize: int = WRITE_BUFSIZE, 
+    partsize: int = READ_BUFSIZE, 
 ) -> Iterator[Buffer]:
     n = partsize
     for b in it:
@@ -1606,7 +1612,7 @@ def bytes_ensure_part_iter(
 async def bytes_ensure_part_async_iter(
     it: Iterable[Buffer] | AsyncIterable[Buffer], 
     /, 
-    partsize: int = WRITE_BUFSIZE, 
+    partsize: int = READ_BUFSIZE, 
 ) -> AsyncIterator[Buffer]:
     n = partsize
     async for b in ensure_aiter(it):
@@ -1715,10 +1721,10 @@ def copyfileobj(
     fsrc, 
     fdst: SupportsWrite[Buffer], 
     /, 
-    chunksize: int = WRITE_BUFSIZE, 
+    chunksize: int = READ_BUFSIZE, 
 ):
     if chunksize <= 0:
-        chunksize = WRITE_BUFSIZE
+        chunksize = READ_BUFSIZE
     fdst_write = fdst.write
     fsrc_read = getattr(fsrc, "read", None)
     fsrc_readinto = getattr(fsrc, "readinto", None)
@@ -1740,11 +1746,11 @@ async def copyfileobj_async(
     fsrc, 
     fdst: SupportsWrite[Buffer], 
     /, 
-    chunksize: int = WRITE_BUFSIZE, 
+    chunksize: int = READ_BUFSIZE, 
     threaded: bool = True, 
 ):
     if chunksize <= 0:
-        chunksize = WRITE_BUFSIZE
+        chunksize = READ_BUFSIZE
     fdst_write = ensure_async(fdst.write, threaded=threaded)
     fsrc_read = getattr(fsrc, "read", None)
     fsrc_readinto = getattr(fsrc, "readinto", None)

{python_filewrap-0.2.8.1 → python_filewrap-0.2.9}/pyproject.toml

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "python-filewrap"
-version = "0.2.8.1"
+version = "0.2.9"
 description = "Python file wrappers."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
 readme = "readme.md"
-homepage = "https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-filewrap"
-repository = "https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-filewrap"
+homepage = "https://github.com/ChenyangGao/python-modules/tree/main/python-filewrap"
+repository = "https://github.com/ChenyangGao/python-modules/tree/main/python-filewrap"
 keywords = ["file", "wrapper"]
 classifiers = [
     "License :: OSI Approved :: MIT License",
@@ -27,7 +27,7 @@ include = [
 
 [tool.poetry.dependencies]
 python = "^3.12"
-python-asynctools = ">=0.1"
+python-asynctools = ">=0.1.3"
 python-property = ">=0.0.3"
 
 [build-system]