Skip to content

Commit f1b7edf

Browse files
committed
Rename "was_xxx" to "on_xxx" in TreeCache
#398 (comment)
1 parent bd5a1d3 commit f1b7edf

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

kazoo/recipe/cache.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def start(self):
6969
self._client.ensure_path(self._root._path)
7070

7171
if self._client.connected:
72-
self._root.was_created()
72+
self._root.on_created()
7373

7474
def close(self):
7575
"""Closes the cache.
@@ -85,7 +85,7 @@ def close(self):
8585
self._state = self.STATE_CLOSED
8686
self._client.remove_listener(self._session_watcher)
8787
with handle_exception(self._error_listeners):
88-
self._root.was_deleted()
88+
self._root.on_deleted()
8989

9090
def listen(self, listener):
9191
"""Registers a function to listen the cache events.
@@ -171,7 +171,7 @@ def _session_watcher(self, state):
171171
self._publish_event(TreeEvent.CONNECTION_SUSPENDED)
172172
elif state == KazooState.CONNECTED:
173173
with handle_exception(self._error_listeners):
174-
self._root.was_reconnected()
174+
self._root.on_reconnected()
175175
self._publish_event(TreeEvent.CONNECTION_RECONNECTED)
176176
elif state == KazooState.LOST:
177177
self._is_initialized = False
@@ -206,20 +206,20 @@ def __init__(self, tree, path, parent):
206206
def make_root(cls, tree, path):
207207
return cls(tree, path, None)
208208

209-
def was_reconnected(self):
209+
def on_reconnected(self):
210210
self._refresh()
211211
for child in self._children.values():
212-
child.was_reconnected()
212+
child.on_reconnected()
213213

214-
def was_created(self):
214+
def on_created(self):
215215
self._refresh()
216216

217-
def was_deleted(self):
217+
def on_deleted(self):
218218
old_children, self._children = self._children, {}
219219
old_data, self._data = self._data, None
220220

221221
for old_child in old_children.values():
222-
old_child.was_deleted()
222+
old_child.on_deleted()
223223

224224
if self._tree._state == self._tree.STATE_CLOSED:
225225
return
@@ -264,9 +264,9 @@ def _process_watch(self, watched_event):
264264
with handle_exception(self._tree._error_listeners):
265265
if watched_event.type == EventType.CREATED:
266266
assert self._parent is None, 'unexpected CREATED on non-root'
267-
self.was_created()
267+
self.on_created()
268268
elif watched_event.type == EventType.DELETED:
269-
self.was_deleted()
269+
self.on_deleted()
270270
elif watched_event.type == EventType.CHANGED:
271271
self._refresh_data()
272272
elif watched_event.type == EventType.CHILD:
@@ -279,24 +279,24 @@ def _process_result(self, method_name, path, result):
279279
if result.successful():
280280
if self._state == self.STATE_DEAD:
281281
self._state = self.STATE_PENDING
282-
self.was_created()
282+
self.on_created()
283283
elif method_name == 'get_children':
284284
try:
285285
children = result.get()
286286
except NoNodeError:
287-
self.was_deleted()
287+
self.on_deleted()
288288
else:
289289
for child in sorted(children):
290290
full_path = os.path.join(path, child)
291291
if child not in self._children:
292292
node = TreeNode(self._tree, full_path, self)
293293
self._children[child] = node
294-
node.was_created()
294+
node.on_created()
295295
elif method_name == 'get':
296296
try:
297297
data, stat = result.get()
298298
except NoNodeError:
299-
self.was_deleted()
299+
self.on_deleted()
300300
else:
301301
old_data, self._data = (
302302
self._data, NodeData.make(path, data, stat))

kazoo/tests/test_cache.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@ def test_exception_handler(self):
253253
error_value = FakeException()
254254
error_handler = Mock()
255255

256-
with patch.object(TreeNode, 'was_deleted') as was_deleted:
257-
was_deleted.side_effect = [error_value]
256+
with patch.object(TreeNode, 'on_deleted') as on_deleted:
257+
on_deleted.side_effect = [error_value]
258258

259259
self.make_cache()
260260
self.cache.listen_fault(error_handler)

0 commit comments

Comments
 (0)