Merge pull request ipython#126 from rmorshea/notify_change_by_dict

only pass a change dict to `_notify_change`

Author: SylvainCorlay

traitlets/config/configurable.py

@@ -186,7 +186,7 @@ def update_config(self, config):
         # merge new config
         self.config.merge(config)
         # unconditionally notify trait change, which triggers load of new config
-        self._notify_change('config', 'trait_change', {
+        self._notify_change({
             'name': 'config',
             'old': oldconfig,
             'new': self.config,

traitlets/tests/test_traitlets.py

@@ -37,7 +37,7 @@ def change_dict(*ordered_values):
 
 class HasTraitsStub(HasTraits):
 
-    def _notify_change(self, name, type, change):
+    def _notify_change(self, change):
         self._notify_name = change['name']
         self._notify_old = change['old']
         self._notify_new = change['new']

traitlets/traitlets.py

@@ -934,8 +934,9 @@ def compress(past_changes, change):
                         past_changes.append(change)
                     return past_changes
 
-            def hold(*a):
-                cache[a[0]] = compress(cache.get(a[0]), a[2])
+            def hold(change):
+                name = change['name']
+                cache[name] = compress(cache.get(name), change)
 
             try:
                 # Replace _notify_change with `hold`, caching and compressing
@@ -950,7 +951,7 @@ def hold(*a):
                     setattr(self, name, value)
             except TraitError as e:
                 # Roll back in case of TraitError during final cross validation.
-                self._notify_change = lambda *x: None
+                self._notify_change = lambda x: None
                 for name, changes in cache.items():
                     for change in changes[::-1]:
                         # TODO: Separate in a rollback function per notification type.
@@ -975,18 +976,20 @@ def hold(*a):
                 # trigger delayed notifications
                 for changes in cache.values():
                     for change in changes:
-                        self._notify_change(change['name'], change['type'], change)
+                        self._notify_change(change)
 
     def _notify_trait(self, name, old_value, new_value):
-        self._notify_change(name, 'change', {
+        self._notify_change({
             'name': name,
             'old': old_value,
             'new': new_value,
             'owner': self,
             'type': 'change',
         })
 
-    def _notify_change(self, name, type, change):
+    def _notify_change(self, change):
+        name, type = change['name'], change['type']
+
         callables = []
         callables.extend(self._trait_notifiers.get(name, {}).get(type, []))
         callables.extend(self._trait_notifiers.get(name, {}).get(All, []))