Support Python 3 in addition to Python 2. #7
Conversation
This file contains 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
imirkin
reviewed
Apr 22, 2020
extract_firmware.py
Outdated
| idx = 0 | ||
| names = ARCHIVE_ORDERS[VERSION] | ||
| for start, end in itertools.izip(gzip_starts, | ||
| for start, end in zip(gzip_starts, |
There was a problem hiding this comment.
Please fix up alignment on next line.
Also add a commit description which explains the at_is_offset thing (you put it in the PR, but that's a GH thing, not a git thing).
There was a problem hiding this comment.
Done. I force pushed a new commit.
- Use print() function; add corresponding future import for Python 2. - Open binary files in binary mode. - Add `b` prefix to strings containing binary data. It makes the strings `bytes` in Python 3 while leave the strings unchanged in Python 2. - Due to the type difference mentioned above, slicing is used in place of subscription to make the code portable between Python 2 and 3. A helper function at_offset_is() is added to keep code short. - xrange() -> range(), itertools.izip() -> zip(), .iteritems() -> .items(); the left hand side only exists in Python 2. - Remove unused `urllib` import.
|
Sorry, I completely forgot -- The new official location for this script is: https://github.com/envytools/firmware Could you resubmit against that? |
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.
b'\xaa'[0]gives different results in Python 2 and 3. Soat_offset_is()is added to work around this issue. Other changes work in both Python 2 and 3.