Skip to content

Commit f04f572

Browse files
authored
Worker: remove old last_*() methods (#226) (#495)
Remove deprecated methods: - Worker.last_error() - Worker.last_node() - Worker.last_read() - Worker.last_retcode() They have been deprecated since at least v1.6.
1 parent 9dff51c commit f04f572

File tree

2 files changed

+0
-76
lines changed

2 files changed

+0
-76
lines changed

lib/ClusterShell/Worker/Worker.py

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -289,42 +289,6 @@ def _on_node_timeout(self, node):
289289

290290
self.task._timeout_add(self, node)
291291

292-
def last_node(self):
293-
"""
294-
Get last node, useful to get the node in an EventHandler
295-
callback like ev_read().
296-
[DEPRECATED] use current_node
297-
"""
298-
warnings.warn("use current_node instead", DeprecationWarning)
299-
return self.current_node
300-
301-
def last_read(self):
302-
"""
303-
Get last (node, buffer), useful in an EventHandler.ev_read()
304-
[DEPRECATED] use (current_node, current_msg)
305-
"""
306-
warnings.warn("use current_node and current_msg instead",
307-
DeprecationWarning)
308-
return self.current_node, self.current_msg
309-
310-
def last_error(self):
311-
"""
312-
Get last (node, error_buffer), useful in an EventHandler.ev_error()
313-
[DEPRECATED] use (current_node, current_errmsg)
314-
"""
315-
warnings.warn("use current_node and current_errmsg instead",
316-
DeprecationWarning)
317-
return self.current_node, self.current_errmsg
318-
319-
def last_retcode(self):
320-
"""
321-
Get last (node, rc), useful in an EventHandler.ev_hup()
322-
[DEPRECATED] use (current_node, current_rc)
323-
"""
324-
warnings.warn("use current_node and current_rc instead",
325-
DeprecationWarning)
326-
return self.current_node, self.current_rc
327-
328292
def node_buffer(self, node):
329293
"""Get specific node buffer."""
330294
return self.read(node, self.SNAME_STDOUT)
@@ -681,24 +645,6 @@ def writer_fileno(self):
681645
"""Return the writer file descriptor as an integer."""
682646
return self.clients[0].streams['stdin'].fd
683647

684-
def last_read(self):
685-
"""
686-
Get last read message.
687-
688-
[DEPRECATED] use current_msg
689-
"""
690-
warnings.warn("use current_msg instead", DeprecationWarning)
691-
return self.current_msg
692-
693-
def last_error(self):
694-
"""
695-
Get last error message.
696-
697-
[DEPRECATED] use current_errmsg
698-
"""
699-
warnings.warn("use current_errmsg instead", DeprecationWarning)
700-
return self.current_errmsg
701-
702648
def error(self):
703649
"""Read worker error buffer."""
704650
return self.read(sname='stderr')

tests/TaskDistantMixin.py

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -734,25 +734,3 @@ def testWorkerEventCount(self):
734734
self.assertEqual(test_eh.hup_count, 2)
735735
self.assertEqual(test_eh.start_count, 1)
736736
self.assertEqual(test_eh.close_count, 1)
737-
738-
def test_last_deprecated(self):
739-
740-
class TestHandlerHandler(EventHandler):
741-
def ev_read(self, worker):
742-
with warnings.catch_warnings(record=True) as wngs:
743-
warnings.simplefilter("always")
744-
self.node, self.msg = worker.last_read()
745-
assert len(wngs) == 1
746-
assert issubclass(wngs[-1].category, DeprecationWarning)
747-
def ev_hup(self, worker):
748-
with warnings.catch_warnings(record=True) as wngs:
749-
warnings.simplefilter("always")
750-
self.node, self.rc = worker.last_retcode()
751-
assert len(wngs) == 1
752-
assert issubclass(wngs[-1].category, DeprecationWarning)
753-
754-
eh = TestHandlerHandler()
755-
reader = self._task.shell("echo foobar", nodes=HOSTNAME, handler=eh)
756-
self._task.resume()
757-
self.assertEqual(eh.node, HOSTNAME)
758-
self.assertEqual(eh.rc, 0)

0 commit comments

Comments
 (0)