Skip to content

Ensure pixels have __len__ before checking with len() #2

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

Open
patch0 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ensure pixels have __len__ before checking with len() #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions sense_hat/sense_hat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,11 +308,11 @@ def set_pixels(self, pixel_list):
and 255
"""

if len(pixel_list) != 64:
if not hasattr(pixel_list, '__len__') or len(pixel_list) != 64:
raise ValueError('Pixel lists must have 64 elements')

for index, pix in enumerate(pixel_list):
if len(pix) != 3:
if not hasattr(pix, '__len__') or len(pix) != 3:
raise ValueError('Pixel at index %d is invalid. Pixels must contain 3 elements: Red, Green and Blue' % index)

for element in pix:
Expand Down Expand Up @@ -353,16 +353,15 @@ def set_pixel(self, x, y, *args):
ap.set_pixel(x, y, pixel)
"""

pixel_error = 'Pixel arguments must be given as (r, g, b) or r, g, b'

if len(args) == 1:
pixel = args[0]
if len(pixel) != 3:
raise ValueError(pixel_error)
elif len(args) == 3:
pixel = args
else:
raise ValueError(pixel_error)
pixel = None

if not hasattr(pixel, '__len__') or len(pixel) != 3:
raise ValueError('Pixel arguments must be given as (r, g, b) or r, g, b')

if x > 7 or x < 0:
raise ValueError('X position must be between 0 and 7')
Expand Down