Skip to content

Merge PR #31 with conflict resolution#37

Merged
tepickering merged 6 commits intomasterfrom
resolve-pr-31
Feb 23, 2026
Merged

Merge PR #31 with conflict resolution#37
tepickering merged 6 commits intomasterfrom
resolve-pr-31

Conversation

@tepickering
Copy link
Copy Markdown
Contributor

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:

Resolution

Combined both — the if self.mainloop is None: guard now wraps the new_event_loop() call:

if self.mainloop is None:
    self.mainloop = asyncio.new_event_loop()
    asyncio.set_event_loop(self.mainloop)

Changes from #31 (all included)

  • Use isinstance() instead of type() equality checks throughout
  • Fix f-string/backslash-in-string-literal issues in error messages
  • Demote verbose prop-set log from warning to debug
  • Respect pre-provided mainloop in both start() and astart()
  • Use etree for IDMessage XML construction instead of string formatting
  • Decode bytes in buildSkeleton error logging

cgobat and others added 6 commits November 14, 2024 21:42
- 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>
@tepickering tepickering merged commit a85c26d into master Feb 23, 2026
2 checks passed
@tepickering tepickering deleted the resolve-pr-31 branch February 23, 2026 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants