Bugfix for calling .decode(...) on str objects
#1758
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
QuLogic
reviewed
Sep 6, 2024
gramps/gen/db/upgrade.py
Outdated
Comment on lines
320
to
322
| if isinstance(parent_handle, str): | ||
| parent_handle = parent_handle.encode() | ||
| placeref_list = [(parent_handle.decode("utf-8"), None)] |
There was a problem hiding this comment.
This seems only used here; it would be simpler to set placeref_list directly instead of encoding and decoding again.
Suggested change
| if isinstance(parent_handle, str): | |
| parent_handle = parent_handle.encode() | |
| placeref_list = [(parent_handle.decode("utf-8"), None)] | |
| if isinstance(parent_handle, str): | |
| placeref_list = [(parent_handle, None)] | |
| else: | |
| placeref_list = [(parent_handle.decode("utf-8"), None)] |
gramps/gen/db/upgrade.py
Outdated
Comment on lines
492
to
494
| if isinstance(parent, str): | ||
| parent = parent.encode() | ||
| placeref_list = [(parent.decode("utf-8"), None)] |
There was a problem hiding this comment.
Same here.
Suggested change
| if isinstance(parent, str): | |
| parent = parent.encode() | |
| placeref_list = [(parent.decode("utf-8"), None)] | |
| if isinstance(parent, str): | |
| placeref_list = [(parent, None)] | |
| else: | |
| placeref_list = [(parent.decode("utf-8"), None)] |
patrick-nicholson
force-pushed
the
upgrade-str-decode
branch
from
4abc5c0
to
9691c8f
Compare
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.
Fixing a string behavior error (py2->py3 change) that prevented me from upgrading a very old database file