Fixes #349: Calculate conflicts for ChangeDiff only when both original and current data exist #350
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
…l and current data exist
arthanson
approved these changes
Oct 29, 2025
magicalyak
added a commit
that referenced
this pull request
Nov 7, 2025
This fixes an AttributeError that occurs when creating objects with custom fields in a branch. PR #350 partially addressed this by checking for None in self.original and self.current, but missed checking self.modified. Changes: - Add None check for self.modified in addition to original and current - Add safety check 'k in self.modified' before accessing modified[k] - Explicitly set self.conflicts = None before returning for clarity This prevents AttributeError when: - Creating circuit terminations with custom fields - Creating devices with module bays and custom fields - Any object creation where self.modified is None Added comprehensive test coverage in test_changediff.py to verify the fix handles all None value scenarios correctly.
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: #349
_update_conflicts()should no-op if either the original or current data is missing for comparison.