Merge PR #31 with conflict resolution#37
Merged
tepickering merged 6 commits intomasterfrom Feb 23, 2026
Merged
Conversation
- Use isinstance() instead of type() equality checks - Fix f-string formatting in AttributeError/TypeError messages (remove backslash continuation in string literals) - Demote verbose prop-set log from warning to debug - Respect pre-provided mainloop in start()/astart() while preserving Python 3.14 compat (new_event_loop + set_event_loop in start()) - Use etree for IDMessage XML construction - Decode bytes in buildSkeleton error logging Conflict resolved: start() now checks if self.mainloop is None before creating a new_event_loop(), combining the Python 3.14 fix from master with the pre-provided mainloop support from PR #31. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
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
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.
Resolves #31
Contains all changes from #31 (misc updates and improvements to
device.py) with the merge conflict resolved.Conflict
device.start()had overlapping edits between #31 and #36:asyncio.new_event_loop() + set_event_loop()if self.mainloop is None: self.mainloop = asyncio.get_event_loop()Resolution
Combined both — the
if self.mainloop is None:guard now wraps thenew_event_loop()call:Changes from #31 (all included)
isinstance()instead oftype()equality checks throughoutwarningtodebugmainloopin bothstart()andastart()etreeforIDMessageXML construction instead of string formattingbuildSkeletonerror logging