Fix index error if datafields outnumber values #40
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ladyada
requested changes
May 27, 2021
adafruit_portalbase/__init__.py
Outdated
| @@ -392,7 +392,7 @@ def _fill_text_labels(self, values): | |||
| if self._text: | |||
| value_index = 0 # In case values and text is not the same | |||
| for i in range(len(self._text)): | |||
| if not self._text[i]["is_data"]: | |||
| if not self._text[i]["is_data"] or value_index > len(values) - 1: | |||
ladyada
reviewed
May 27, 2021
adafruit_portalbase/__init__.py
Outdated
| @@ -392,7 +392,7 @@ def _fill_text_labels(self, values): | |||
| if self._text: | |||
| value_index = 0 # In case values and text is not the same | |||
| for i in range(len(self._text)): | |||
| if not self._text[i]["is_data"]: | |||
| if not self._text[i]["is_data"] or (value_index > len(values) - 1): | |||
There was a problem hiding this comment.
if (not self._text[i]["is_data"]) or (value_index > (len(values) - 1)):
There was a problem hiding this comment.
gotcha, thanks
ladyada
requested changes
May 27, 2021
adafruit_portalbase/__init__.py
Outdated
| @@ -392,7 +392,7 @@ def _fill_text_labels(self, values): | |||
| if self._text: | |||
| value_index = 0 # In case values and text is not the same | |||
| for i in range(len(self._text)): | |||
| if not self._text[i]["is_data"] or (value_index > len(values) - 1): | |||
| if (not self._text[i]["is_data"]) or (value_index > len(values) - 1): | |||
There was a problem hiding this comment.
one more!
if (not self._text[i]["is_data"]) or (value_index > (len(values) - 1)):
ladyada
approved these changes
May 27, 2021
adafruit-adabot
added a commit
to adafruit/Adafruit_CircuitPython_Bundle
that referenced
this pull request
May 28, 2021
Updating https://github.com/adafruit/Adafruit_CircuitPython_PortalBase to 1.7.1 from 1.7.0: > Merge pull request adafruit/Adafruit_CircuitPython_PortalBase#40 from makermelissa/main > Moved CI to Python 3.7 > Added help text and problem matcher > Added pull request template
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes adafruit/Adafruit_Learning_System_Guides#1553.