Memory.blocks() using memoryviews only

Signed-off-by: Andrea Zoppi <[email protected]>
TexZK · Jan 21, 2024 · ad3af59 · ad3af59
1 parent 3518227
commit ad3af59
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 15 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+0.0.8 (2024-01-21)
+------------------
+
+* Added ``chop`` method.
+* Minor fixes.
+
+
 0.0.7 (2023-12-10)
 ------------------
 

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 2-Clause License
 
-Copyright (c) 2020-2023, Andrea Zoppi
+Copyright (c) 2020-2024, Andrea Zoppi
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/src/bytesparse/__init__.py b/src/bytesparse/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023, Andrea Zoppi.
+# Copyright (c) 2020-2024, Andrea Zoppi.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -112,7 +112,7 @@
 
 """
 
-__version__ = '0.0.7'
+__version__ = '0.0.8'
 
 from .inplace import Memory
 from .inplace import bytesparse

diff --git a/src/bytesparse/base.py b/src/bytesparse/base.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023, Andrea Zoppi.
+# Copyright (c) 2020-2024, Andrea Zoppi.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -703,7 +703,7 @@ def blocks(
         self,
         start: Optional[Address] = None,
         endex: Optional[Address] = None,
-    ) -> Iterator[Tuple[Address, memoryview]]:
+    ) -> Iterator[Block]:
         r"""Iterates over blocks.
 
         Iterates over data blocks within an address range.

diff --git a/src/bytesparse/inplace.py b/src/bytesparse/inplace.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023, Andrea Zoppi.
+# Copyright (c) 2020-2024, Andrea Zoppi.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -856,12 +856,13 @@ def blocks(
         self,
         start: Optional[Address] = None,
         endex: Optional[Address] = None,
-    ) -> Iterator[Tuple[Address, Union[memoryview, bytearray]]]:
+    ) -> Iterator[Block]:
 
         blocks = self._blocks
         if blocks:
             if start is None and endex is None:  # faster
-                yield from blocks
+                for block_start, block_data in blocks:
+                    yield [block_start, memoryview(block_data)]
             else:
                 block_index_start = 0 if start is None else self._block_index_start(start)
                 block_index_endex = len(blocks) if endex is None else self._block_index_endex(endex)
@@ -875,7 +876,7 @@ def blocks(
                     if slice_start < slice_endex:
                         slice_view = memoryview(block_data)
                         slice_view = slice_view[(slice_start - block_start):(slice_endex - block_start)]
-                        yield slice_start, slice_view
+                        yield [slice_start, slice_view]
 
     def bound(
         self,
@@ -993,7 +994,7 @@ def chop(
         start: Optional[Address] = None,
         endex: Optional[Address] = None,
         align: bool = False,
-    ) -> Iterator[Block]:
+    ) -> Iterator[Tuple[Address, memoryview]]:
 
         if width < 1:
             raise ValueError('invalid width')
@@ -3091,7 +3092,7 @@ def blocks(
         self,
         start: Optional[Address] = None,
         endex: Optional[Address] = None,
-    ) -> Iterator[Tuple[Address, memoryview]]:
+    ) -> Iterator[Block]:
 
         start, endex = self._rectify_span(start, endex)
         yield from super().blocks(start=start, endex=endex)

diff --git a/src/bytesparse/io.py b/src/bytesparse/io.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023, Andrea Zoppi.
+# Copyright (c) 2020-2024, Andrea Zoppi.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/tests/_common.py b/tests/_common.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023, Andrea Zoppi.
+# Copyright (c) 2020-2024, Andrea Zoppi.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/tests/test_inplace.py b/tests/test_inplace.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023, Andrea Zoppi.
+# Copyright (c) 2020-2024, Andrea Zoppi.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/tests/test_io.py b/tests/test_io.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023, Andrea Zoppi.
+# Copyright (c) 2020-2024, Andrea Zoppi.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without