summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Pascual <cpascual@cells.es>2021-06-17 11:51:52 +0200
committerCarlos Pascual <cpascual@cells.es>2021-06-17 11:58:32 +0200
commitf298b6d4f200159709c53041e3ec6cf107912c7f (patch)
treea44a3af7eb0fc6f3664eaada04e812ed45a7abb7
parent7a0d58b29cd75488aeb8f79b690788d1fd781cfd (diff)
[flake8] Fix E712,E713,E714,721 issues
Fix flake8 issues with comparisons.
-rw-r--r--lib/taurus/core/tango/tangodatabase.py4
-rw-r--r--lib/taurus/core/tango/tangodevice.py4
-rw-r--r--lib/taurus/core/tango/tangofactory.py8
-rw-r--r--lib/taurus/core/taurusattribute.py2
-rw-r--r--lib/taurus/core/taurusmanager.py4
-rw-r--r--lib/taurus/core/tauruspollingtimer.py6
-rw-r--r--lib/taurus/core/util/codecs.py4
-rw-r--r--lib/taurus/core/util/eventfilters.py2
-rw-r--r--lib/taurus/core/util/log.py4
-rw-r--r--lib/taurus/core/util/singleton.py2
-rw-r--r--lib/taurus/qt/qtcore/util/properties.py2
-rw-r--r--lib/taurus/qt/qtgui/base/taurusbase.py8
-rw-r--r--lib/taurus/qt/qtgui/graphic/jdraw/jdraw.py6
-rw-r--r--lib/taurus/qt/qtgui/graphic/taurusgraphic.py2
-rw-r--r--lib/taurus/qt/qtgui/input/qwheel.py4
-rw-r--r--lib/taurus/qt/qtgui/panel/taurusconfigeditor.py4
-rw-r--r--lib/taurus/qt/qtgui/panel/taurusmessagepanel.py2
-rw-r--r--lib/taurus/qt/qtgui/table/taurusvaluestable.py2
-rw-r--r--lib/taurus/qt/qtgui/test/test_widgets_general.py2
-rw-r--r--lib/taurus/qt/qtgui/util/tauruswidgetfactory.py4
20 files changed, 37 insertions, 39 deletions
diff --git a/lib/taurus/core/tango/tangodatabase.py b/lib/taurus/core/tango/tangodatabase.py
index eda73dd6..2ba3d467 100644
--- a/lib/taurus/core/tango/tangodatabase.py
+++ b/lib/taurus/core/tango/tangodatabase.py
@@ -188,7 +188,7 @@ class TangoDevInfo(TangoInfo):
a long time for devices that are declared as exported but are in fact
not running (crashed, network error, power cut, etc)
"""
- if not self._state is None:
+ if self._state is not None:
return self._state
exported = self.exported()
if exported:
@@ -787,7 +787,7 @@ class TangoAuthority(TaurusAuthority):
# This way we can call for example get_attribute_property on an object of
# this class
def __getattr__(self, name):
- if not self.dbObj is None:
+ if self.dbObj is not None:
return getattr(self.dbObj, name)
return None
diff --git a/lib/taurus/core/tango/tangodevice.py b/lib/taurus/core/tango/tangodevice.py
index 75a23840..e7acbb56 100644
--- a/lib/taurus/core/tango/tangodevice.py
+++ b/lib/taurus/core/tango/tangodevice.py
@@ -125,7 +125,7 @@ class TangoDevice(TaurusDevice):
)
def getState(self, cache=True):
stateAttrValue = self.stateObj.read(cache=cache)
- if not stateAttrValue is None:
+ if stateAttrValue is not None:
state_rvalue = stateAttrValue.rvalue
return DevState.values[state_rvalue.value]
return None
@@ -212,7 +212,7 @@ class TangoDevice(TaurusDevice):
self.trace("[TangoDevice] cleanUp")
self._descr = None
- if not self._deviceStateObj is None:
+ if self._deviceStateObj is not None:
self._deviceStateObj.removeListener(self)
self._deviceStateObj = None
self._deviceObj = None
diff --git a/lib/taurus/core/tango/tangofactory.py b/lib/taurus/core/tango/tangofactory.py
index 9efb4775..34f72da8 100644
--- a/lib/taurus/core/tango/tangofactory.py
+++ b/lib/taurus/core/tango/tangofactory.py
@@ -320,7 +320,7 @@ class TangoFactory(Singleton, TaurusFactory, Logger):
ret = self.dft_db
else:
ret = self.tango_db.get(name)
- if not ret is None:
+ if ret is not None:
return ret
validator = _Authority.getNameValidator()
groups = validator.getUriGroups(name)
@@ -520,7 +520,7 @@ class TangoFactory(Singleton, TaurusFactory, Logger):
def _storeDevice(self, dev):
name, alias = dev.getFullName(), dev.getSimpleName()
exists = self.tango_devs.get(name)
- if not exists is None:
+ if exists is not None:
if exists == dev:
msg = "%s has already been registered before" % name
else:
@@ -531,13 +531,13 @@ class TangoFactory(Singleton, TaurusFactory, Logger):
self.debug(msg)
raise DoubleRegistration(msg)
self.tango_devs[name] = dev
- if not alias is None and len(alias):
+ if alias is not None and len(alias):
self.tango_alias_devs[alias] = dev
def _storeAttribute(self, attr):
name = attr.getFullName()
exists = self.tango_attrs.get(name)
- if not exists is None:
+ if exists is not None:
if exists == attr:
msg = "%s has already been registered before" % name
else:
diff --git a/lib/taurus/core/taurusattribute.py b/lib/taurus/core/taurusattribute.py
index 39a4aa23..e8994ffd 100644
--- a/lib/taurus/core/taurusattribute.py
+++ b/lib/taurus/core/taurusattribute.py
@@ -66,7 +66,7 @@ class TaurusAttribute(TaurusModel):
# If everything went well, the object is stored
storeCallback = kwargs.get("storeCallback", None)
- if not storeCallback is None:
+ if storeCallback is not None:
storeCallback(self)
self.writable = None
diff --git a/lib/taurus/core/taurusmanager.py b/lib/taurus/core/taurusmanager.py
index 3d968ea2..f2902993 100644
--- a/lib/taurus/core/taurusmanager.py
+++ b/lib/taurus/core/taurusmanager.py
@@ -460,12 +460,12 @@ class TaurusManager(Singleton, Logger):
plugin = s
else:
scheme = self._find_scheme(s)
- if not scheme is None:
+ if scheme is not None:
s.schemes = (scheme,)
plugin = s
except Exception:
pass
- if not plugin is None:
+ if plugin is not None:
self.debug("Found plugin %s" % plugin.__name__)
plugins.append(plugin)
return plugins
diff --git a/lib/taurus/core/tauruspollingtimer.py b/lib/taurus/core/tauruspollingtimer.py
index f77e9127..056d0a96 100644
--- a/lib/taurus/core/tauruspollingtimer.py
+++ b/lib/taurus/core/tauruspollingtimer.py
@@ -120,12 +120,10 @@ class TaurusPollingTimer(Logger):
:param attribute: the attribute to be added
:type attribute: taurus.core.taurusattribute.TaurusAttribute
- :param auto_start: if True (default) it tells the polling timer that it
- should startup as soon as there is at least one attribute
- registered.
+ :param auto_start: deprecated. Ignored (always autostarts)
:type auto_start: bool
"""
- if auto_start == False:
+ if auto_start is False:
self.deprecated(
"TaurusPollingTimer.addAttribute auto_start argument",
rel="4.7.1",
diff --git a/lib/taurus/core/util/codecs.py b/lib/taurus/core/util/codecs.py
index a94e6db7..3eac9480 100644
--- a/lib/taurus/core/util/codecs.py
+++ b/lib/taurus/core/util/codecs.py
@@ -1092,13 +1092,13 @@ class CodecFactory(Singleton, Logger):
codec = self._codecs.get(format)
if codec is None:
codec = self._getNewCodec(format)
- if not codec is None:
+ if codec is not None:
self._codecs[format] = codec
return codec
def _getNewCodec(self, format):
klass = self._codec_klasses.get(format)
- if not klass is None:
+ if klass is not None:
ret = klass()
else:
try:
diff --git a/lib/taurus/core/util/eventfilters.py b/lib/taurus/core/util/eventfilters.py
index 0c0bccfb..f3235991 100644
--- a/lib/taurus/core/util/eventfilters.py
+++ b/lib/taurus/core/util/eventfilters.py
@@ -128,7 +128,7 @@ class EventValueMap(dict):
import copy
from taurus.core import TaurusEventType, DataType
- if not t in (TaurusEventType.Change, TaurusEventType.Periodic):
+ if t not in (TaurusEventType.Change, TaurusEventType.Periodic):
return s, t, v
if v is None:
return s, t, v
diff --git a/lib/taurus/core/util/log.py b/lib/taurus/core/util/log.py
index 0c7ab904..624802d0 100644
--- a/lib/taurus/core/util/log.py
+++ b/lib/taurus/core/util/log.py
@@ -221,7 +221,7 @@ class LogIt(object):
log_obj.log(self._level, out_msg, exc_info=exc_info)
raise
out_msg += " %s" % fname
- if not ret is None and self._showret:
+ if ret is not None and self._showret:
out_msg += " = %s" % str(ret)
if self._col_limit and len(out_msg) > self._col_limit:
out_msg = "%s [...]" % out_msg[: self._col_limit - 6]
@@ -381,7 +381,7 @@ class PrintIt(object):
print(out_msg)
raise
out_msg += " %s" % fname
- if not ret is None and self._showret:
+ if ret is not None and self._showret:
out_msg += " = %s" % str(ret)
print(out_msg)
print()
diff --git a/lib/taurus/core/util/singleton.py b/lib/taurus/core/util/singleton.py
index 906f3165..f65a5c39 100644
--- a/lib/taurus/core/util/singleton.py
+++ b/lib/taurus/core/util/singleton.py
@@ -70,7 +70,7 @@ class Singleton(object):
def __new__(cls, *p, **k):
# srubio: added type checking
- if cls != type(cls._the_instance):
+ if cls != type(cls._the_instance): # noqa: E721
cls._the_instance = object.__new__(cls)
# srubio: added init_single check
diff --git a/lib/taurus/qt/qtcore/util/properties.py b/lib/taurus/qt/qtcore/util/properties.py
index 187c2b77..595353bc 100644
--- a/lib/taurus/qt/qtcore/util/properties.py
+++ b/lib/taurus/qt/qtcore/util/properties.py
@@ -91,7 +91,7 @@ def djoin(a, b):
]
)
for k, v in other.items():
- dct[k] = v if not k in dct else djoin(dct[k], v)
+ dct[k] = v if k not in dct else djoin(dct[k], v)
return dct
diff --git a/lib/taurus/qt/qtgui/base/taurusbase.py b/lib/taurus/qt/qtgui/base/taurusbase.py
index 1f676735..c8136aad 100644
--- a/lib/taurus/qt/qtgui/base/taurusbase.py
+++ b/lib/taurus/qt/qtgui/base/taurusbase.py
@@ -1014,7 +1014,7 @@ class TaurusBaseComponent(TaurusListener, BaseConfigurableClass):
:rtype: bool
"""
res = False
- if not self.modelObj is None:
+ if self.modelObj is not None:
res = self.modelObj.isWritable()
res = res and not self.isReadOnly()
return res
@@ -1116,7 +1116,7 @@ class TaurusBaseComponent(TaurusListener, BaseConfigurableClass):
if self.isAttached():
m = self.getModelObj()
- if not m is None:
+ if m is not None:
m.removeListener(self)
pos = self.log_name.find(".")
@@ -1300,7 +1300,7 @@ class TaurusBaseComponent(TaurusListener, BaseConfigurableClass):
if model is None:
model = ""
model = str(model)
- if check == True and model == self._localModelName:
+ if check and model == self._localModelName:
return
self._localModelName = model
@@ -1824,7 +1824,7 @@ class TaurusBaseWidget(TaurusBaseComponent):
:param disconnect: whether or not to disconnect on hide event
:type disconnect: bool
"""
- if not self.visible() and disconnect == False:
+ if not self.visible() and not disconnect:
self.info(
"Ignoring setDisconnectOnHide to False: widget is not visible"
)
diff --git a/lib/taurus/qt/qtgui/graphic/jdraw/jdraw.py b/lib/taurus/qt/qtgui/graphic/jdraw/jdraw.py
index 9324b1a9..2c1794e0 100644
--- a/lib/taurus/qt/qtgui/graphic/jdraw/jdraw.py
+++ b/lib/taurus/qt/qtgui/graphic/jdraw/jdraw.py
@@ -349,7 +349,7 @@ class TaurusJDrawGraphicsFactory(Singleton, TaurusBaseGraphicsFactory, Logger):
if name.lower() == "ignorerepaint":
name = ""
- if not "extensions" in params:
+ if "extensions" not in params:
params["extensions"] = {}
params.get("extensions")["ignoreRepaint"] = "true"
@@ -371,7 +371,7 @@ class TaurusJDrawGraphicsFactory(Singleton, TaurusBaseGraphicsFactory, Logger):
)
visibilitymapper = params.get("visibilitymapper")
- if not visibilitymapper is None:
+ if visibilitymapper is not None:
mapping_type = visibilitymapper["mapping_type"]
mode = visibilitymapper["mode"]
default = visibilitymapper["default"]
@@ -379,7 +379,7 @@ class TaurusJDrawGraphicsFactory(Singleton, TaurusBaseGraphicsFactory, Logger):
item._map = visibilitymapper["map"]
visible = params.get("visible")
- if not visible is None:
+ if visible is not None:
item.setVisible(visible)
extensions = params.get("extensions")
diff --git a/lib/taurus/qt/qtgui/graphic/taurusgraphic.py b/lib/taurus/qt/qtgui/graphic/taurusgraphic.py
index dd194d89..085095dc 100644
--- a/lib/taurus/qt/qtgui/graphic/taurusgraphic.py
+++ b/lib/taurus/qt/qtgui/graphic/taurusgraphic.py
@@ -1428,7 +1428,7 @@ class TaurusGraphicsStateItem(TaurusGraphicsItem):
# item is visible or not)
if (
v
- and not self._map is None
+ and self._map is not None
and self._currText in DevState.__members__
):
if DevState[self._currText] == self._map[1]:
diff --git a/lib/taurus/qt/qtgui/input/qwheel.py b/lib/taurus/qt/qtgui/input/qwheel.py
index 16b8d1d1..aec1f57a 100644
--- a/lib/taurus/qt/qtgui/input/qwheel.py
+++ b/lib/taurus/qt/qtgui/input/qwheel.py
@@ -392,9 +392,9 @@ class QWheelEdit(Qt.QFrame):
None, meaning use the existing number of decimal digits
"""
- if not int_nb is None:
+ if int_nb is not None:
self._intDigitCount = int_nb
- if not dec_nb is None:
+ if dec_nb is not None:
self._decDigitCount = dec_nb
# make sure that the current value can be displayed
diff --git a/lib/taurus/qt/qtgui/panel/taurusconfigeditor.py b/lib/taurus/qt/qtgui/panel/taurusconfigeditor.py
index 8014e3c6..e6eaef5b 100644
--- a/lib/taurus/qt/qtgui/panel/taurusconfigeditor.py
+++ b/lib/taurus/qt/qtgui/panel/taurusconfigeditor.py
@@ -146,7 +146,7 @@ class QConfigEditorModel(Qt.QStandardItemModel):
except Exception:
key = val[0]
dict[key] = self.removeBranch(dict[key], path)
- if self._delete == True:
+ if self._delete is True:
if "__orderedConfigNames__" not in dict:
return dict
dict["__orderedConfigNames__"] = self.removeBranch(
@@ -155,7 +155,7 @@ class QConfigEditorModel(Qt.QStandardItemModel):
self._delete = False
return dict
else:
- if self._delete == True:
+ if self._delete is True:
if dict.count(val[0]) == 0:
return dict
dict.remove(val[0])
diff --git a/lib/taurus/qt/qtgui/panel/taurusmessagepanel.py b/lib/taurus/qt/qtgui/panel/taurusmessagepanel.py
index 3b9052b1..643c59cc 100644
--- a/lib/taurus/qt/qtgui/panel/taurusmessagepanel.py
+++ b/lib/taurus/qt/qtgui/panel/taurusmessagepanel.py
@@ -200,7 +200,7 @@ _REPORT_HANDLERS = None
def get_report_handlers():
global _REPORT_HANDLERS
- if not _REPORT_HANDLERS is None:
+ if _REPORT_HANDLERS is not None:
return _REPORT_HANDLERS
import os.path
diff --git a/lib/taurus/qt/qtgui/table/taurusvaluestable.py b/lib/taurus/qt/qtgui/table/taurusvaluestable.py
index 0bc2509b..d5eabdad 100644
--- a/lib/taurus/qt/qtgui/table/taurusvaluestable.py
+++ b/lib/taurus/qt/qtgui/table/taurusvaluestable.py
@@ -108,7 +108,7 @@ class TaurusValuesIOTableModel(Qt.QAbstractTableModel):
def data(self, index, role=Qt.Qt.DisplayRole):
"""see :meth:`Qt.QAbstractTableModel.data`"""
- if self._writeMode == False:
+ if self._writeMode is False:
tabledata = self._rtabledata
else:
tabledata = self._wtabledata
diff --git a/lib/taurus/qt/qtgui/test/test_widgets_general.py b/lib/taurus/qt/qtgui/test/test_widgets_general.py
index 147d7e36..a4b67e17 100644
--- a/lib/taurus/qt/qtgui/test/test_widgets_general.py
+++ b/lib/taurus/qt/qtgui/test/test_widgets_general.py
@@ -143,7 +143,7 @@ def test_set_models(qtbot, caplog, nodb_dev, widgetname, depr, models):
else:
try:
model_obj = taurus.Object(model)
- except Exception: # allow non-string models (e.g. lists of models)
+ except Exception: # allow e.g. lists of models
model_obj = None
w.setModel(model)
assert w.getModelObj() == model_obj
diff --git a/lib/taurus/qt/qtgui/util/tauruswidgetfactory.py b/lib/taurus/qt/qtgui/util/tauruswidgetfactory.py
index accaed68..dce92259 100644
--- a/lib/taurus/qt/qtgui/util/tauruswidgetfactory.py
+++ b/lib/taurus/qt/qtgui/util/tauruswidgetfactory.py
@@ -117,7 +117,7 @@ class TaurusWidgetFactory(Singleton, Logger):
elems = os.listdir(path)
taurus_ret, qt_ret = {}, {}
- if not "__init__.py" in elems:
+ if "__init__.py" not in elems:
return taurus_ret, qt_ret
try:
@@ -148,7 +148,7 @@ class TaurusWidgetFactory(Singleton, Logger):
if (
(not elem.startswith("."))
and os.path.isdir(abs_elem)
- and (not elem in self.skip_modules)
+ and (elem not in self.skip_modules)
):
m_name = os.path.splitext(elem)[0]
new_module_name = "%s.%s" % (module_name, m_name)