Skip to content

Don't call notify_change with non-change events #437

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.

Sign up for GitHub

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

Merged
minrk merged 1 commit into from
Aug 10, 2017
Merged

Don't call notify_change with non-change events #437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions traitlets/traitlets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ def get(self, obj, cls=None):
with obj.cross_validation_lock:
value = self._validate(obj, default)
obj._trait_values[self.name] = value
obj.notify_change(Bunch(
obj._notify_observers(Bunch(
name=self.name,
value=value,
owner=obj,
Expand Down Expand Up @@ -1198,10 +1198,15 @@ def _notify_trait(self, name, old_value, new_value):
))

def notify_change(self, change):
if not isinstance(change, Bunch):
"""Notify observers of a change event"""
return self._notify_observers(change)

def _notify_observers(self, event):
"""Notify observers of any event"""
if not isinstance(event, Bunch):
# cast to bunch if given a dict
change = Bunch(change)
name, type = change.name, change.type
event = Bunch(event)
name, type = event.name, event.type

callables = []
callables.extend(self._trait_notifiers.get(name, {}).get(type, []))
Expand All @@ -1211,7 +1216,7 @@ def notify_change(self, change):

# Now static ones
magic_name = '_%s_changed' % name
if change.type == "change" and hasattr(self, magic_name):
if event.type == "change" and hasattr(self, magic_name):
class_value = getattr(self.__class__, magic_name)
if not isinstance(class_value, ObserveHandler):
_deprecated_method(class_value, self.__class__, magic_name,
Expand All @@ -1231,7 +1236,7 @@ def notify_change(self, change):
elif isinstance(c, EventHandler) and c.name is not None:
c = getattr(self, c.name)

c(change)
c(event)

def _add_notifiers(self, handler, name, type):
if name not in self._trait_notifiers:
Expand Down