further fixes of py3 issues

complaints by pylint are mainly related to
- remove object from base list in class definitions
- unnecessary else/elif after return/raise

Change-Id: I13d15449149cc8bba0562338d0c9c42e97163bdf
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21325
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
2019-09-26 13:17:49 +02:00
parent 70a9c42a7a
commit c1164568ae
33 changed files with 83 additions and 89 deletions

View File

@ -30,11 +30,11 @@ from secop.errors import IsBusyError
from secop.lib import mkthread
class Namespace(object):
class Namespace:
pass
class Step(object):
class Step:
def __init__(self, desc, waittime, func, *args, **kwds):
self.desc = desc
@ -44,7 +44,7 @@ class Step(object):
self.kwds = kwds
class SequencerMixin(object):
class SequencerMixin:
"""Mixin for worker classes that need to execute a sequence of actions,
including waits, that exceeds the usual Tango timeout (about 3 seconds)
and should be executed asynchronously.
@ -129,11 +129,11 @@ class SequencerMixin(object):
def read_status(self):
if self.seq_is_alive():
return self.Status.BUSY, 'moving: ' + self._seq_phase
elif self._seq_error:
if self._seq_error:
if self._seq_fault_on_error:
return self.Status.ERROR, self._seq_error
return self.Status.WARN, self._seq_error
elif self._seq_stopped:
if self._seq_stopped:
if self._seq_fault_on_stop:
return self.Status.ERROR, self._seq_stopped
return self.Status.WARN, self._seq_stopped