Skip to content

Fix/slice notation #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 1, 2021
Merged

Fix/slice notation #28

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ab02f7b
Updated to use slice notation for __setitem__
tekktrik Oct 30, 2021
7bcf182
Remove the ability to use slice stepping
tekktrik Oct 30, 2021
0c79155
Update code example in docstring
tekktrik Oct 30, 2021
27f9df3
Reformatting per pre-commit
tekktrik Oct 30, 2021
2656d7a
Corrected ValueError text formatting
tekktrik Nov 30, 2021
dc14672
Fix writing of slice to FRAM
tekktrik Nov 30, 2021
ae0264f
Reformatted per pre-commit
tekktrik Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions adafruit_fram.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,16 +163,14 @@ def __setitem__(self, address, value):
fram[0] = 1

# write values 0 thru 4 with a list
fram[0] = [0,1,2,3]
fram[0:4] = [0,1,2,3]
"""
if self.write_protected:
raise RuntimeError("FRAM currently write protected.")

if isinstance(address, int):
if not isinstance(value, (int, bytes, bytearray, list, tuple)):
raise ValueError(
"Data must be a single integer, bytes, bytearray, list, or tuple."
)
if not isinstance(value, int):
raise ValueError("Data must be a single integer for single addresses")
if not 0 <= address < self._max_size:
raise ValueError(
"Address '{0}' out of range. It must be 0 <= address < {1}.".format(
Expand All @@ -183,7 +181,27 @@ def __setitem__(self, address, value):
self._write(address, value, self._wraparound)

elif isinstance(address, slice):
raise ValueError("Slicing not available during write operations.")
if not isinstance(value, (bytes, bytearray, list, tuple)):
raise ValueError(
"Data must be bytes, bytearray, list, "
"or tuple for multiple addresses"
)
if (address.start is None) or (address.stop is None):
raise ValueError("Boundless slices are not supported")
if (address.step is not None) and (address.step != 1):
raise ValueError("Slice stepping is not currently available.")
if (address.start < 0) or (address.stop > self._max_size):
raise ValueError(
"Slice '{0}:{1}' out of range. All addresses must be 0 <= address < {2}.".format( # pylint: disable=line-too-long
address.start, address.stop, self._max_size
)
)
if len(value) < (len(range(address.start, address.stop))):
raise ValueError(
"Cannot set values with a list smaller than the number of indexes"
)

self._write(address.start, value, self._wraparound)

def _read_address(self, address, read_buffer):
# Implemented by subclass
Expand Down