omdev 0.0.0.dev521__tar.gz → 0.0.0.dev522__tar.gz

{omdev-0.0.0.dev521/omdev.egg-info → omdev-0.0.0.dev522}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev521
+Version: 0.0.0.dev522
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev521
+Requires-Dist: omlish==0.0.0.dev522
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev521 → omdev-0.0.0.dev522}/omdev/scripts/lib/io/streams.py

@@ -29,12 +29,12 @@ def __omlish_amalg__():  # noqa
             dict(path='base.py', sha1='67ae88ffabae21210b5452fe49c9a3e01ca164c5'),
             dict(path='framing.py', sha1='3b0a684d7f844c99ad116dabc082f2d9bec466a6'),
             dict(path='reading.py', sha1='7631635c46ab4b40bcaeb7c506cf15cb2d529a40'),
-            dict(path='utils.py', sha1='26621e9a464d6ce6e662f457c70288b6ee71aa7b'),
-            dict(path='direct.py', sha1='6c04ad9249a8536ff1ccf7760e299ea34180502f'),
+            dict(path='utils.py', sha1='f29ce425931dda3a1ce1cc3f2a90ae867d790358'),
+            dict(path='direct.py', sha1='c7a8cf3adb785387e410381cc83be2aad74b8d41'),
             dict(path='scanning.py', sha1='5d4cf0776463a6f675ca74ca87637133b78b51a2'),
             dict(path='adapters.py', sha1='1a6c209490fa78947a607101e20169a5e135847b'),
-            dict(path='linear.py', sha1='dbee5a728aabbc22df49e5b31afc71b2b5dac988'),
-            dict(path='segmented.py', sha1='5a24346389644caac91c25e9d2ccbe76b26a71a6'),
+            dict(path='linear.py', sha1='c58741a70953bfb53f369782db46e7912af790b3'),
+            dict(path='segmented.py', sha1='69b63fb61953eaaea7e996cbd96555882ba8f6f2'),
             dict(path='_amalg.py', sha1='4511d6a6f9ae80585eea1c68980df5323ef0ef14'),
         ],
     )
@@ -1032,12 +1032,12 @@ class ByteStreamBuffers:
 
     @staticmethod
     def can_bytes(obj: ta.Any) -> bool:
-        return isinstance(obj, ByteStreamBuffers._CAN_CONVERT_TYPES)
+        return type(obj) in (cts := ByteStreamBuffers._CAN_CONVERT_TYPES) or isinstance(obj, cts)
 
     @staticmethod
     def _to_bytes(obj: ta.Any) -> bytes:
-        if isinstance(obj, memoryview):
-            return obj.tobytes()
+        if type(obj) is memoryview or isinstance(obj, memoryview):
+            return ByteStreamBuffers._memoryview_to_bytes(obj)
 
         elif isinstance(obj, ByteStreamBufferView):
             return obj.tobytes()
@@ -1050,9 +1050,13 @@ class ByteStreamBuffers:
 
     @staticmethod
     def to_bytes(obj: ta.Any) -> bytes:
-        if isinstance(obj, bytes):
+        if (ot := type(obj)) is bytes:
             return obj
+        elif ot is bytearray:
+            return bytes(obj)
 
+        elif isinstance(obj, bytes):
+            return obj
         elif isinstance(obj, bytearray):
             return bytes(obj)
 
@@ -1061,7 +1065,7 @@ class ByteStreamBuffers:
 
     @staticmethod
     def to_bytes_or_bytearray(obj: ta.Any) -> ta.Union[bytes, bytearray]:
-        if isinstance(obj, (bytes, bytearray)):
+        if (ot := type(obj)) is bytes or ot is bytearray or isinstance(obj, (bytes, bytearray)):
             return obj
 
         else:
@@ -1069,28 +1073,11 @@ class ByteStreamBuffers:
 
     #
 
-    # @staticmethod
-    # def can_byte_stream_buffer(obj: ta.Any) -> bool:
-    #     return isinstance(obj, ByteStreamBuffers._CAN_CONVERT_TYPES)
-
-    # @staticmethod
-    # def to_byte_stream_buffer(obj: ta.Any) -> ByteStreamBuffer:
-    #     if isinstance(obj, ByteStreamBuffer):
-    #         return obj
-    #
-    #     elif isinstance(obj, ByteStreamBufferLike):
-    #         return obj
-
-    #
-
     @staticmethod
     def bytes_len(obj: ta.Any) -> int:
-        if isinstance(obj, (bytes, bytearray, memoryview)):
+        if ByteStreamBuffers.can_bytes(obj):
             return len(obj)
 
-        elif isinstance(obj, ByteStreamBufferLike):
-            return sum(len(mv) for mv in obj.segments())
-
         else:
             # Not bytes-like
             return 0
@@ -1099,9 +1086,13 @@ class ByteStreamBuffers:
 
     @staticmethod
     def iter_segments(obj: ta.Any) -> ta.Iterator[memoryview]:
-        if isinstance(obj, memoryview):
+        if (ot := type(obj)) is memoryview:
             yield obj
+        elif ot is bytes or ot is bytearray:
+            yield memoryview(obj)
 
+        elif isinstance(obj, memoryview):
+            yield obj
         elif isinstance(obj, (bytes, bytearray)):
             yield memoryview(obj)
 
@@ -1111,6 +1102,15 @@ class ByteStreamBuffers:
         else:
             raise TypeError(obj)
 
+    #
+
+    @staticmethod
+    def _memoryview_to_bytes(mv: memoryview) -> bytes:
+        if (((ot := type(obj := mv.obj)) is bytes or ot is bytearray or isinstance(obj, (bytes, bytearray))) and len(mv) == len(obj)):  # type: ignore[arg-type]  # noqa
+            return obj  # type: ignore[return-value]
+
+        return mv.tobytes()
+
 
 ########################################
 # ../direct.py
@@ -1147,13 +1147,7 @@ class BaseDirectByteStreamBufferLike(BaseByteStreamBufferLike, Abstract):
         except AttributeError:
             pass
 
-        mv = self._mv_
-        obj = mv.obj
-        if isinstance(obj, (bytes, bytearray)) and len(mv) == len(obj):
-            b = obj
-        else:
-            b = bytes(mv)
-        self._b_ = b
+        self._b_ = b = ByteStreamBuffers._memoryview_to_bytes(self._mv_)  # noqa
         return b
 
 
@@ -1769,7 +1763,7 @@ class LinearByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffer):
         if not data:
             return
         if isinstance(data, memoryview):
-            data = data.tobytes()
+            data = ByteStreamBuffers._memoryview_to_bytes(data)  # noqa
         elif isinstance(data, bytearray):
             data = bytes(data)
 
@@ -2188,7 +2182,7 @@ class SegmentedByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffe
         if not data:
             return
         if isinstance(data, memoryview):
-            data = data.tobytes()
+            data = ByteStreamBuffers._memoryview_to_bytes(data)  # noqa
         # elif isinstance(data, bytearray):
         #     pass
         # else:

{omdev-0.0.0.dev521 → omdev-0.0.0.dev522/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev521
+Version: 0.0.0.dev522
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev521
+Requires-Dist: omlish==0.0.0.dev522
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev521 → omdev-0.0.0.dev522}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev521
+omlish==0.0.0.dev522
 
 [all]
 black~=26.1

{omdev-0.0.0.dev521 → omdev-0.0.0.dev522}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev521'
+version = '0.0.0.dev522'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev521',
+    'omlish == 0.0.0.dev522',
 ]
 
 [project.optional-dependencies]