Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make ui_handler publicly available again #1827

Merged
merged 2 commits into from
Jan 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
Traits CHANGELOG
================

Release 7.0.2
-------------

Released: 2025-01-24

This is a bugfix release of the Traits package that fixes an interoperability
issue with Pyface (a regression since Traits 6.4.3).

Fixes
~~~~~
* Make ``traits.trait_notifiers.ui_handler`` public again, since
Pyface relies on importing it directly. (#1827)


Release 7.0.1
-------------

Expand Down
18 changes: 10 additions & 8 deletions traits/trait_notifiers.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,33 @@

# The currently active handler for notifications that must be run on the UI
# thread, or None if no handler has been set.
_ui_handler = None
# Note: the Pyface library current accesses the `ui_handler` attribute
# directly, so we can't make it private yet.
ui_handler = None


def get_ui_handler():
"""
Return the current user interface thread handler.
"""
return _ui_handler
return ui_handler


def set_ui_handler(handler):
""" Sets up the user interface thread handler.
"""
global _ui_handler
global ui_handler

_ui_handler = handler
ui_handler = handler


def ui_dispatch(handler, *args, **kw):
if threading.current_thread() == threading.main_thread():
handler(*args, **kw)
elif _ui_handler is None:
elif ui_handler is None:
raise RuntimeError("no UI handler registered for dispatch='ui'")
else:
_ui_handler(handler, *args, **kw)
ui_handler(handler, *args, **kw)


class NotificationExceptionHandlerState(object):
Expand Down Expand Up @@ -616,10 +618,10 @@ class FastUITraitChangeNotifyWrapper(TraitChangeNotifyWrapper):
def dispatch(self, handler, *args):
if threading.current_thread() == threading.main_thread():
handler(*args)
elif _ui_handler is None:
elif ui_handler is None:
raise RuntimeError("no UI handler registered for dispatch='ui'")
else:
_ui_handler(handler, *args)
ui_handler(handler, *args)


class NewTraitChangeNotifyWrapper(TraitChangeNotifyWrapper):
Expand Down
Loading