python-filewrap 0.2.9.1__tar.gz → 0.3.0.1__tar.gz

{python_filewrap-0.2.9.1 → python_filewrap-0.3.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-filewrap
-Version: 0.2.9.1
+Version: 0.3.0.1
 Summary: Python file wrappers.
 License: MIT
 License-File: LICENSE

{python_filewrap-0.2.9.1 → python_filewrap-0.3.0.1}/filewrap/__init__.py

@@ -2,18 +2,19 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 2, 9)
+__version__ = (0, 3, 0)
 __all__ = [
     "SupportsRead", "SupportsReadinto", "SupportsWrite", "SupportsSeek", 
-    "AsyncBufferedReader", "AsyncTextIOWrapper", "buffer_length", 
-    "bio_chunk_iter", "bio_chunk_async_iter", "bio_skip_iter", "bio_skip_async_iter", 
-    "bytes_iter", "bytes_async_iter", "bytes_iter_skip", "bytes_async_iter_skip", 
-    "bytes_iter_to_reader", "bytes_iter_to_async_reader", "bytes_to_chunk_iter", 
-    "bytes_to_chunk_async_iter", "bytes_ensure_part_iter", "bytes_ensure_part_async_iter", 
-    "progress_bytes_iter", "progress_bytes_async_iter", "copyfileobj", "copyfileobj_async", 
-    "bound_bytes_reader", "bound_async_bytes_reader", 
+    "AsyncBufferedReader", "AsyncTextIOWrapper", "buffer_length", "to_string_buffer", 
+    "to_bytes_buffer", "bio_chunk_iter", "bio_chunk_async_iter", "bio_skip_iter", 
+    "bio_skip_async_iter", "bytes_iter", "bytes_async_iter", "bytes_iter_skip", 
+    "bytes_async_iter_skip", "bytes_iter_to_reader", "bytes_iter_to_async_reader", 
+    "bytes_to_chunk_iter", "bytes_to_chunk_async_iter", "bytes_ensure_part_iter", 
+    "bytes_ensure_part_async_iter", "progress_bytes_iter", "progress_bytes_async_iter", 
+    "copyfileobj", "copyfileobj_async", "bound_bytes_reader", "bound_async_bytes_reader", 
 ]
 
+from array import array
 from asyncio import Lock as AsyncLock
 from codecs import getdecoder, getencoder
 from collections.abc import (
@@ -262,7 +263,7 @@ class AsyncBufferedReader(BufferedReader):
             length = buffer_length(data)
             self._pos += buffer_length(prev_data) + length
             if BUFSIZE <= length:
-                buf_view[:] = memoryview(data)[-BUFSIZE:]
+                buf_view[:] = memoryview(data).cast("B")[-BUFSIZE:]
                 self._buf_pos = self._buf_stop = BUFSIZE
             else:
                 buf_pos_stop = buf_stop + length
@@ -307,7 +308,7 @@ class AsyncBufferedReader(BufferedReader):
                 else:
                     return 0
         BUFSIZE = buffer_length(buf_view)
-        buffer_view = memoryview(buffer)
+        buffer_view = memoryview(buffer).cast("B")
         buffer_view[:buf_size] = buf_view[buf_pos:buf_stop]
         buf_pos = self._buf_pos = buf_stop
         self._pos += buf_size
@@ -379,7 +380,7 @@ class AsyncBufferedReader(BufferedReader):
                 else:
                     return 0
         BUFSIZE = buffer_length(buf_view)
-        buffer_view = memoryview(buffer)
+        buffer_view = memoryview(buffer).cast("B")
         buffer_view[:buf_size] = buf_view[buf_pos:buf_stop]
         buf_pos = self._buf_pos = buf_stop
         self._pos += buf_size
@@ -470,7 +471,7 @@ class AsyncBufferedReader(BufferedReader):
         prev_data = buf_view[buf_pos:buf_stop].tobytes()
         self._pos += buffer_length(prev_data) + length
         if BUFSIZE <= length:
-            buf_view[:] = memoryview(data)[-BUFSIZE:]
+            buf_view[:] = memoryview(data).cast("B")[-BUFSIZE:]
             self._buf_pos = self._buf_stop = BUFSIZE
         else:
             buf_pos_stop = buf_stop + length
@@ -656,7 +657,7 @@ class AsyncTextIOWrapper(TextIOWrapper):
                 size -= len(text)
             return n
 
-        cache: bytes | memoryview = memoryview(data)
+        cache: bytes | memoryview = memoryview(data).cast("B")
         while size and buffer_length(data) == size:
             while cache:
                 try:
@@ -826,9 +827,24 @@ def get_bom(encoding: str, /) -> bytes:
 
 
 def buffer_length(b: Buffer, /) -> int:
-    if isinstance(b, (bytes, bytearray, memoryview)):
+    if isinstance(b, (bytes, bytearray)):
         return len(b)
-    return len(memoryview(b))
+    return memoryview(b).nbytes
+
+
+def to_string_buffer(s: str, /) -> array:
+    return array("w", s)
+
+
+def to_bytes_buffer(b: Buffer, /) -> bytes | bytearray | memoryview:
+    if isinstance(b, (bytes, bytearray)):
+        return b
+    view = memoryview(b)
+    if view.format == "B":
+        return view
+    if view.c_contiguous:
+        return view.cast("B")
+    return view.tobytes()
 
 
 def bio_chunk_iter(
@@ -1140,7 +1156,7 @@ def bytes_iter(
             else:
                 break
         else:
-            yield memoryview(b)[:size]
+            yield memoryview(b).cast("B")[:size]
             if callback is not None:
                 callback(size)
             break
@@ -1172,7 +1188,7 @@ async def bytes_async_iter(
             else:
                 break
         else:
-            yield memoryview(b)[:size]
+            yield memoryview(b).cast("B")[:size]
             if callback is not None:
                 await callback(size)
             break
@@ -1189,8 +1205,8 @@ def bytes_iter_skip(
         return it
     if not callable(callback):
         callback = None
-    m: memoryview
-    for m in map(memoryview, it): # type: ignore
+    for b in it:
+        m = memoryview(b).cast("B")
         l = buffer_length(m)
         if callback:
             callback(min(l, size))
@@ -1215,7 +1231,7 @@ async def bytes_async_iter_skip(
         return it
     callback = ensure_async(callback) if callable(callback) else None
     async for b in it:
-        m = memoryview(b)
+        m = memoryview(b).cast("B")
         l = buffer_length(m)
         if callback:
             await callback(min(l, size))
@@ -1291,8 +1307,9 @@ def bytes_iter_to_reader(
                 del unconsumed[:]
             try:
                 while True:
-                    if b := memoryview(getnext()):
-                        m = n + len(b)
+                    b = memoryview(getnext()).cast("B")
+                    if b_len := b.nbytes:
+                        m = n + b_len
                         if m >= bufsize:
                             delta = bufsize - n
                             buf[n:] = b[:delta]
@@ -1301,7 +1318,7 @@ def bytes_iter_to_reader(
                             return bufsize
                         else:
                             buf[n:m] = b
-                            pos += len(b)
+                            pos += b_len
                             n = m
             except StopIteration:
                 at_end = True
@@ -1460,8 +1477,9 @@ def bytes_iter_to_async_reader(
                 del unconsumed[:]
             try:
                 while True:
-                    if b := memoryview(await getnext()):
-                        m = n + len(b)
+                    b = memoryview(await getnext()).cast("B")
+                    if b_len := b.nbytes:
+                        m = n + b_len
                         if m >= bufsize:
                             delta = bufsize - n
                             buf[n:] = b[:delta]
@@ -1470,7 +1488,7 @@ def bytes_iter_to_async_reader(
                             return bufsize
                         else:
                             buf[n:m] = b
-                            pos += len(b)
+                            pos += b_len
                             n = m
             except (StopIteration, StopAsyncIteration):
                 at_end = True
@@ -1566,7 +1584,7 @@ def bytes_to_chunk_iter(
     /, 
     chunksize: int = READ_BUFSIZE, 
 ) -> Iterator[memoryview]:
-    m = memoryview(b)
+    m = memoryview(b).cast("B")
     for i in range(0, buffer_length(m), chunksize):
         yield m[i:i+chunksize]
 
@@ -1576,7 +1594,7 @@ async def bytes_to_chunk_async_iter(
     /, 
     chunksize: int = READ_BUFSIZE, 
 ) -> AsyncIterator[memoryview]:
-    m = memoryview(b)
+    m = memoryview(b).cast("B")
     for i in range(0, buffer_length(m), chunksize):
         yield m[i:i+chunksize]
 
@@ -1588,7 +1606,7 @@ def bytes_ensure_part_iter(
 ) -> Iterator[Buffer]:
     n = partsize
     for b in it:
-        m = memoryview(b)
+        m = memoryview(b).cast("B")
         l = buffer_length(m)
         if l <= n:
             yield b
@@ -1616,7 +1634,7 @@ async def bytes_ensure_part_async_iter(
 ) -> AsyncIterator[Buffer]:
     n = partsize
     async for b in ensure_aiter(it):
-        m = memoryview(b)
+        m = memoryview(b).cast("B")
         l = buffer_length(m)
         if l <= n:
             yield b
@@ -1730,7 +1748,7 @@ def copyfileobj(
     fsrc_readinto = getattr(fsrc, "readinto", None)
     if callable(fsrc_readinto):
         buf = bytearray(chunksize)
-        view = memoryview(buf)
+        view = memoryview(buf).cast("B")
         while size := fsrc_readinto(buf):
             fdst_write(view[:size])
     elif callable(fsrc_read):
@@ -1757,7 +1775,7 @@ async def copyfileobj_async(
     if callable(fsrc_readinto):
         fsrc_readinto = ensure_async(fsrc_readinto, threaded=threaded)
         buf = bytearray(chunksize)
-        view = memoryview(buf)
+        view = memoryview(buf).cast("B")
         while size := await fsrc_readinto(buf):
             await fdst_write(view[:size])
     elif callable(fsrc_read):
@@ -1798,7 +1816,7 @@ def bound_bytes_reader(
             if f_readinto is None:
                 raise NotImplementedError("readinto")
             if size > 0:
-                n = f_readinto(memoryview(buffer)[:size])
+                n = f_readinto(memoryview(buffer).cast("B")[:size])
                 size -= n
                 return n
             return 0
@@ -1833,7 +1851,7 @@ def bound_async_bytes_reader(
             if f_readinto is None:
                 raise NotImplementedError("readinto")
             if size > 0:
-                n = await f_readinto(memoryview(buffer)[:size])
+                n = await f_readinto(memoryview(buffer).cast("B")[:size])
                 size -= n
                 return n
             return 0

{python_filewrap-0.2.9.1 → python_filewrap-0.3.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-filewrap"
-version = "0.2.9.1"
+version = "0.3.0.1"
 description = "Python file wrappers."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"