diff options
| author | Carlos Pascual <cpascual@cells.es> | 2021-06-17 14:30:00 +0200 |
|---|---|---|
| committer | Carlos Pascual <cpascual@cells.es> | 2021-06-17 14:30:00 +0200 |
| commit | 61dc107ae6e05c72192c8c3d4cca26f712076a2b (patch) | |
| tree | 41202e2550dac72acad7adf517131416b03e6150 | |
| parent | 78c831d127a85d20130f83e6467bd2fc772612b7 (diff) | |
[flake8] Fix F401 issues
Remove unused imports or explicitly ignore F401 when
required (typically on init files)
116 files changed, 253 insertions, 276 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index b49d3cf7..30b85dd3 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -87,7 +87,7 @@ def _build_doc_api(): # clean previously existing rst files rstCreator.cleanAutogenerated(_api_dir) # generate api - import taurus + import taurus # noqa: F401 r = rstCreator.documentModule("taurus", _api_dir) # report diff --git a/doc/source/devel/examples/edit01.py b/doc/source/devel/examples/edit01.py index 8900abb4..d2f560c5 100644 --- a/doc/source/devel/examples/edit01.py +++ b/doc/source/devel/examples/edit01.py @@ -3,11 +3,7 @@ from taurus.external.qt import Qt from taurus.qt.qtgui.application import TaurusApplication from taurus.qt.qtgui.display import TaurusLabel -from taurus.qt.qtgui.input import ( - TaurusValueLineEdit, - TaurusValueSpinBox, - TaurusWheelEdit, -) +from taurus.qt.qtgui.input import TaurusValueLineEdit app = TaurusApplication(sys.argv, cmd_line_parser=None) diff --git a/lib/taurus/__init__.py b/lib/taurus/__init__.py index 03f67072..9ad03d09 100644 --- a/lib/taurus/__init__.py +++ b/lib/taurus/__init__.py @@ -39,4 +39,4 @@ for attr, value in __R.__dict__.items(): Release.__doc__ = __R.__doc__ -from .core.taurushelper import * # noqa: E402,F403 +from .core.taurushelper import * # noqa: E402,F403,F401 diff --git a/lib/taurus/cli/__init__.py b/lib/taurus/cli/__init__.py index 0af7ed78..0e61660c 100644 --- a/lib/taurus/cli/__init__.py +++ b/lib/taurus/cli/__init__.py @@ -41,4 +41,4 @@ see :mod:`taurus.cli.common` .. seealso:: :mod:`taurus.cli.alt` """ -from .cli import main, register_subcommands, taurus_cmd +from .cli import main, register_subcommands, taurus_cmd # noqa: F401 diff --git a/lib/taurus/console/__init__.py b/lib/taurus/console/__init__.py index 3d3c0bef..0a45f794 100644 --- a/lib/taurus/console/__init__.py +++ b/lib/taurus/console/__init__.py @@ -26,4 +26,4 @@ """ """ -from .enums import * # noqa: F403 +from .enums import * # noqa: F403,F401 diff --git a/lib/taurus/core/__init__.py b/lib/taurus/core/__init__.py index b373f220..591f05a9 100644 --- a/lib/taurus/core/__init__.py +++ b/lib/taurus/core/__init__.py @@ -36,6 +36,6 @@ LIGHTWEIGHT_IMPORTS = getattr( ) if LIGHTWEIGHT_IMPORTS: - from .init_lightweight import * # noqa: F403 + from .init_lightweight import * # noqa: F403,F401 else: - from .init_bkcomp import * # noqa: F403 + from .init_bkcomp import * # noqa: F403,F401 diff --git a/lib/taurus/core/epics/__init__.py b/lib/taurus/core/epics/__init__.py index 32c42938..d8477526 100644 --- a/lib/taurus/core/epics/__init__.py +++ b/lib/taurus/core/epics/__init__.py @@ -68,7 +68,7 @@ classes are just convenience dummy objects in the epics scheme at this point. Epics records may eventually be mapped as Devices. """ try: - from .epicsfactory import * # noqa: F403 + from .epicsfactory import * # noqa: F403,F401 except ImportError as e: # This is a workaround to avoid breaking pytest collection # TODO: the try-except can be removed when moving this to external plugin diff --git a/lib/taurus/core/epics/epicsfactory.py b/lib/taurus/core/epics/epicsfactory.py index aa438883..e806f64d 100644 --- a/lib/taurus/core/epics/epicsfactory.py +++ b/lib/taurus/core/epics/epicsfactory.py @@ -29,7 +29,7 @@ Epics module. See __init__.py for more detailed documentation import weakref try: - import epics + import epics # noqa: F401 except ImportError: from taurus.core.util.log import debug diff --git a/lib/taurus/core/epics/epicsvalidator.py b/lib/taurus/core/epics/epicsvalidator.py index 3f9fab6f..cd7f95ec 100644 --- a/lib/taurus/core/epics/epicsvalidator.py +++ b/lib/taurus/core/epics/epicsvalidator.py @@ -31,7 +31,7 @@ __all__ = [ "EpicsAttributeNameValidator", ] -import re + from taurus.core.taurusvalidator import ( TaurusAttributeNameValidator, TaurusDeviceNameValidator, diff --git a/lib/taurus/core/evaluation/__init__.py b/lib/taurus/core/evaluation/__init__.py index bbedbc69..53bf69fd 100644 --- a/lib/taurus/core/evaluation/__init__.py +++ b/lib/taurus/core/evaluation/__init__.py @@ -170,7 +170,7 @@ Some examples of valid evaluation models are: issue warnings if detected. """ -from .evalfactory import EvaluationFactory -from .evalattribute import EvaluationAttribute -from .evalauthority import EvaluationAuthority -from .evaldevice import EvaluationDevice +from .evalfactory import EvaluationFactory # noqa: F401 +from .evalattribute import EvaluationAttribute # noqa: F401 +from .evalauthority import EvaluationAuthority # noqa: F401 +from .evaldevice import EvaluationDevice # noqa: F401 diff --git a/lib/taurus/core/evaluation/evaldevice.py b/lib/taurus/core/evaluation/evaldevice.py index 1b043be3..91ed5a6b 100644 --- a/lib/taurus/core/evaluation/evaldevice.py +++ b/lib/taurus/core/evaluation/evaldevice.py @@ -24,7 +24,6 @@ __all__ = ["EvaluationDevice"] -from taurus import Factory from taurus.core.taurusdevice import TaurusDevice from taurus.core.util.safeeval import SafeEvaluator from taurus.core.taurusbasetypes import TaurusDevState, TaurusAttrValue diff --git a/lib/taurus/core/init_bkcomp.py b/lib/taurus/core/init_bkcomp.py index bb60619b..87a68e17 100644 --- a/lib/taurus/core/init_bkcomp.py +++ b/lib/taurus/core/init_bkcomp.py @@ -26,21 +26,21 @@ """The core module """ -from . import release as Release +from . import release as Release # noqa: F401 -from .taurusbasetypes import * # noqa: F403 -from .taurusexception import * # noqa: F403 -from .taurusmodel import * # noqa: F403 -from .tauruslistener import * # noqa: F403 -from .taurusdevice import * # noqa: F403 -from .taurusattribute import * # noqa: F403 -from .taurusconfiguration import * # noqa: F403 -from .taurusauthority import * # noqa: F403 -from .taurusfactory import * # noqa: F403 -from .taurusmanager import * # noqa: F403 -from .taurusoperation import * # noqa: F403 -from .tauruspollingtimer import * # noqa: F403 -from .taurusvalidator import * # noqa: F403 -from .units import * # noqa: F403 +from .taurusbasetypes import * # noqa: F403,F401 +from .taurusexception import * # noqa: F403,F401 +from .taurusmodel import * # noqa: F403,F401 +from .tauruslistener import * # noqa: F403,F401 +from .taurusdevice import * # noqa: F403,F401 +from .taurusattribute import * # noqa: F403,F401 +from .taurusconfiguration import * # noqa: F403,F401 +from .taurusauthority import * # noqa: F403,F401 +from .taurusfactory import * # noqa: F403,F401 +from .taurusmanager import * # noqa: F403,F401 +from .taurusoperation import * # noqa: F403,F401 +from .tauruspollingtimer import * # noqa: F403,F401 +from .taurusvalidator import * # noqa: F403,F401 +from .units import * # noqa: F403,F401 __docformat__ = "restructuredtext" diff --git a/lib/taurus/core/init_lightweight.py b/lib/taurus/core/init_lightweight.py index f32cf25c..0c17ae5c 100644 --- a/lib/taurus/core/init_lightweight.py +++ b/lib/taurus/core/init_lightweight.py @@ -29,7 +29,7 @@ __docformat__ = "restructuredtext" # import release as Release -from .taurusbasetypes import * # noqa: F403 +from .taurusbasetypes import * # noqa: F403,F401 # from .taurusexception import * # from .taurusmodel import * diff --git a/lib/taurus/core/resource/__init__.py b/lib/taurus/core/resource/__init__.py index 5c7512cb..946d4fb6 100644 --- a/lib/taurus/core/resource/__init__.py +++ b/lib/taurus/core/resource/__init__.py @@ -98,4 +98,4 @@ to the `myattr` resource name, calling `taurus.Attribute('res:myattr')` will return a :class:`EvaluationAttribute`, not a `ResAttribute` (`ResAttribute` is not even defined). """ -from .resfactory import * # noqa: F403 +from .resfactory import * # noqa: F403,F401 diff --git a/lib/taurus/core/resource/test/test_resvalidator.py b/lib/taurus/core/resource/test/test_resvalidator.py index 773f7207..d22ebb96 100644 --- a/lib/taurus/core/resource/test/test_resvalidator.py +++ b/lib/taurus/core/resource/test/test_resvalidator.py @@ -26,8 +26,6 @@ """Test for taurus.core.resource.test.test_resvalidator... """ -import os.path as osp - import taurus from taurus.core.taurusexception import TaurusException import unittest diff --git a/lib/taurus/core/tango/__init__.py b/lib/taurus/core/tango/__init__.py index 553100d5..5098be96 100644 --- a/lib/taurus/core/tango/__init__.py +++ b/lib/taurus/core/tango/__init__.py @@ -103,12 +103,12 @@ Finally, the TangoFactory object can be accessed as:: issue warnings if detected. """ -from .enums import * # noqa: F403 -from .tangodatabase import * # noqa: F403 -from .tangodevice import * # noqa: F403 -from .tangofactory import * # noqa: F403 -from .tangoattribute import * # noqa: F403 -from .tangoconfiguration import * # noqa: F403 +from .enums import * # noqa: F403,F401 +from .tangodatabase import * # noqa: F403,F401 +from .tangodevice import * # noqa: F403,F401 +from .tangofactory import * # noqa: F403,F401 +from .tangoattribute import * # noqa: F403,F401 +from .tangoconfiguration import * # noqa: F403,F401 __docformat__ = "restructuredtext" diff --git a/lib/taurus/core/tango/img/__init__.py b/lib/taurus/core/tango/img/__init__.py index 8778cc15..f58e770f 100644 --- a/lib/taurus/core/tango/img/__init__.py +++ b/lib/taurus/core/tango/img/__init__.py @@ -27,7 +27,7 @@ images (CCDs, detectors, etc) """ -from .img import * # noqa: F403 +from .img import * # noqa: F403,F401 __docformat__ = "restructuredtext" diff --git a/lib/taurus/core/tango/search.py b/lib/taurus/core/tango/search.py index d5579241..c66d1fb7 100644 --- a/lib/taurus/core/tango/search.py +++ b/lib/taurus/core/tango/search.py @@ -6,4 +6,4 @@ __deprecated( rel="4.1.2", ) -from taurus.core.util.fandango_search import * # noqa: F403,E402 +from taurus.core.util.fandango_search import * # noqa diff --git a/lib/taurus/core/tango/test/__init__.py b/lib/taurus/core/tango/test/__init__.py index cb4aa7b4..0e78ee7e 100644 --- a/lib/taurus/core/tango/test/__init__.py +++ b/lib/taurus/core/tango/test/__init__.py @@ -23,8 +23,8 @@ # # ########################################################################### -from .nodb import NamedDeviceTestContext, nodb_dev -from .res.TangoSchemeTest import TangoSchemeTest +from .nodb import NamedDeviceTestContext, nodb_dev # noqa: F401 +from .res.TangoSchemeTest import TangoSchemeTest # noqa: F401 # TODO: remove the following import of deprecated -from .tgtestds import TangoSchemeTestLauncher, taurus_test_ds # deprecated +from .tgtestds import TangoSchemeTestLauncher, taurus_test_ds # noqa: F401 diff --git a/lib/taurus/core/tango/test/res/TangoSchemeTest.py b/lib/taurus/core/tango/test/res/TangoSchemeTest.py index 43d66682..ebaab1e4 100755 --- a/lib/taurus/core/tango/test/res/TangoSchemeTest.py +++ b/lib/taurus/core/tango/test/res/TangoSchemeTest.py @@ -38,8 +38,6 @@ from tango.server import ( command, ) -from threading import Thread - """ We should check tango version @@ -623,6 +621,7 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta): # This thread seems to cause issues with the tests. Disable it for now # disables the periodically pushed events in float_scalar_evt attribute # TODO: investigate if we can re-enable this feature + # from threading import Thread # self.t = Thread(target=self._update_loop) # self.t.setDaemon(True) # self.t.start() diff --git a/lib/taurus/core/tango/test/test_tangoattribute.py b/lib/taurus/core/tango/test/test_tangoattribute.py index 137f34f2..9dfcbd46 100644 --- a/lib/taurus/core/tango/test/test_tangoattribute.py +++ b/lib/taurus/core/tango/test/test_tangoattribute.py @@ -40,7 +40,7 @@ from taurus.core import DataType, DataFormat from taurus.core.tango.tangoattribute import TangoAttrValue from taurus.core.taurusbasetypes import AttrQuality import pytest -from .nodb import nodb_dev +from .nodb import nodb_dev # noqa _INT_IMG = numpy.arange(2 * 3, dtype="int16").reshape((2, 3)) _INT_SPE = _INT_IMG[1, :] diff --git a/lib/taurus/core/tango/test/test_tangofactory.py b/lib/taurus/core/tango/test/test_tangofactory.py index 6dcb4931..d1b258ee 100644 --- a/lib/taurus/core/tango/test/test_tangofactory.py +++ b/lib/taurus/core/tango/test/test_tangofactory.py @@ -30,7 +30,7 @@ import time import taurus import pytest -from .nodb import nodb_dev +from .nodb import nodb_dev # noqa import gc diff --git a/lib/taurus/core/tango/util/__init__.py b/lib/taurus/core/tango/util/__init__.py index 3bd0b3bd..ddf256ab 100644 --- a/lib/taurus/core/tango/util/__init__.py +++ b/lib/taurus/core/tango/util/__init__.py @@ -26,6 +26,6 @@ """The sardana package. It contains specific part of sardana """ -from .formatter import tangoFormatter +from .formatter import tangoFormatter # noqa: F401 __docformat__ = "restructuredtext" diff --git a/lib/taurus/core/tango/util/tango_taurus.py b/lib/taurus/core/tango/util/tango_taurus.py index b8e7d80f..b6c3f795 100644 --- a/lib/taurus/core/tango/util/tango_taurus.py +++ b/lib/taurus/core/tango/util/tango_taurus.py @@ -33,7 +33,6 @@ from pint import UndefinedUnitError from taurus.core.taurusbasetypes import ( AttrQuality, DisplayLevel, - TaurusAttrValue, DataType, DataFormat, ) diff --git a/lib/taurus/core/taurusattribute.py b/lib/taurus/core/taurusattribute.py index e8994ffd..bd9b00f0 100644 --- a/lib/taurus/core/taurusattribute.py +++ b/lib/taurus/core/taurusattribute.py @@ -30,7 +30,6 @@ __all__ = ["TaurusAttribute"] __docformat__ = "restructuredtext" -import weakref from .taurusmodel import TaurusModel from taurus.core.taurusbasetypes import TaurusElementType, DataType diff --git a/lib/taurus/core/taurushelper.py b/lib/taurus/core/taurushelper.py index 93d10422..ef7e5318 100644 --- a/lib/taurus/core/taurushelper.py +++ b/lib/taurus/core/taurushelper.py @@ -333,7 +333,6 @@ def Attribute(dev_or_attr_name, attr_name=None): :return: a taurus attribute :rtype: :class:`taurus.core.taurusattribute.TaurusAttribute` """ - import types if attr_name is None: return Factory( diff --git a/lib/taurus/core/taurusmodel.py b/lib/taurus/core/taurusmodel.py index a7bf5e0e..6ba3a517 100644 --- a/lib/taurus/core/taurusmodel.py +++ b/lib/taurus/core/taurusmodel.py @@ -35,7 +35,7 @@ from .util.event import ( BoundMethodWeakref, _BoundMethodWeakrefWithCall, ) -from .taurusbasetypes import TaurusEventType, MatchLevel +from .taurusbasetypes import TaurusEventType from .taurushelper import Factory __all__ = ["TaurusModel"] diff --git a/lib/taurus/core/test/__init__.py b/lib/taurus/core/test/__init__.py index 2f095a12..69d4b6d7 100644 --- a/lib/taurus/core/test/__init__.py +++ b/lib/taurus/core/test/__init__.py @@ -23,10 +23,15 @@ # # ########################################################################### -from .basevalidator import valid, invalid, names, AbstractNameValidatorTestCase +from .basevalidator import ( # noqa: F401 + valid, + invalid, + names, + AbstractNameValidatorTestCase, +) # deprecated: -from .modelequality import ( +from .modelequality import ( # noqa: F401 TaurusModelEqualityTestCase, testAttributeModelEquality, testDeviceModelEquality, diff --git a/lib/taurus/core/util/__init__.py b/lib/taurus/core/util/__init__.py index 51140f45..47b19ec1 100644 --- a/lib/taurus/core/util/__init__.py +++ b/lib/taurus/core/util/__init__.py @@ -35,6 +35,6 @@ LIGHTWEIGHT_IMPORTS = getattr( ) if LIGHTWEIGHT_IMPORTS: - from .init_lightweight import * # noqa: F403 + from .init_lightweight import * # noqa: F403,F401 else: - from .init_bkcomp import * # noqa: F403 + from .init_bkcomp import * # noqa: F403,F401 diff --git a/lib/taurus/core/util/argparse/__init__.py b/lib/taurus/core/util/argparse/__init__.py index d548d839..315c4ba4 100644 --- a/lib/taurus/core/util/argparse/__init__.py +++ b/lib/taurus/core/util/argparse/__init__.py @@ -25,6 +25,6 @@ __docformat__ = "restructuredtext" -from .taurusargparse import * # noqa: F403 +from .taurusargparse import * # noqa: F403,F401 __doc__ = taurusargparse.__doc__ diff --git a/lib/taurus/core/util/containers.py b/lib/taurus/core/util/containers.py index ae2fa28f..31676cbb 100644 --- a/lib/taurus/core/util/containers.py +++ b/lib/taurus/core/util/containers.py @@ -994,8 +994,6 @@ class SortedDict(dict): existing in the dictionary or a callable providing a sorting key algorithm. """ - import operator - if hasattr(key, "__call__"): self._keys = sorted(self._keys, key=key) else: diff --git a/lib/taurus/core/util/init_bkcomp.py b/lib/taurus/core/util/init_bkcomp.py index a3beace3..32decbb9 100644 --- a/lib/taurus/core/util/init_bkcomp.py +++ b/lib/taurus/core/util/init_bkcomp.py @@ -35,23 +35,23 @@ of the elements are taurus independent and can be used generically. """ # instead of: # from taurus.core.util import Logger -from .containers import * # noqa: F403 -from .enumeration import * # noqa: F403 -from .event import * # noqa: F403 -from .log import * # noqa: F403 -from .object import * # noqa: F403 -from .singleton import * # noqa: F403 +from .containers import * # noqa: F403,F401 +from .enumeration import * # noqa: F403,F401 +from .event import * # noqa: F403,F401 +from .log import * # noqa: F403,F401 +from .object import * # noqa: F403,F401 +from .singleton import * # noqa: F403,F401 -from .codecs import * # noqa: F403 -from .colors import * # noqa: F403 -from .constant import * # noqa: F403 -from .timer import * # noqa: F403 -from .safeeval import * # noqa: F403 -from .prop import * # noqa: F403 -from .threadpool import * # noqa: F403 -from .user import * # noqa: F403 +from .codecs import * # noqa: F403,F401 +from .colors import * # noqa: F403,F401 +from .constant import * # noqa: F403,F401 +from .timer import * # noqa: F403,F401 +from .safeeval import * # noqa: F403,F401 +from .prop import * # noqa: F403,F401 +from .threadpool import * # noqa: F403,F401 +from .user import * # noqa: F403,F401 -from . import eventfilters +from . import eventfilters # noqa: F401 try: from lxml import etree diff --git a/lib/taurus/core/util/init_lightweight.py b/lib/taurus/core/util/init_lightweight.py index 26506ce8..d7b4c028 100644 --- a/lib/taurus/core/util/init_lightweight.py +++ b/lib/taurus/core/util/init_lightweight.py @@ -38,12 +38,12 @@ __docformat__ = "restructuredtext" # instead of: # from taurus.core.util import Logger -from .containers import * # noqa: F403 -from .enumeration import * # noqa: F403 -from .event import * # noqa: F403 -from .log import * # noqa: F403 -from .object import * # noqa: F403 -from .singleton import * # noqa: F403 +from .containers import * # noqa: F403,F401 +from .enumeration import * # noqa: F403,F401 +from .event import * # noqa: F403,F401 +from .log import * # noqa: F403,F401 +from .object import * # noqa: F403,F401 +from .singleton import * # noqa: F403,F401 # from .codecs import * # from .colors import * diff --git a/lib/taurus/core/util/log.py b/lib/taurus/core/util/log.py index 2e233a8c..9fcddfbe 100644 --- a/lib/taurus/core/util/log.py +++ b/lib/taurus/core/util/log.py @@ -27,7 +27,6 @@ :mod:`logging` system. """ -import io import os import sys import logging.handlers diff --git a/lib/taurus/core/util/report/__init__.py b/lib/taurus/core/util/report/__init__.py index 5ec6536c..44ddce63 100644 --- a/lib/taurus/core/util/report/__init__.py +++ b/lib/taurus/core/util/report/__init__.py @@ -26,4 +26,4 @@ """This module provides a panel to display taurus messages """ -from .report import * # noqa: F403 +from .report import * # noqa diff --git a/lib/taurus/external/argparse/__init__.py b/lib/taurus/external/argparse/__init__.py index a82f7c17..f1ffc880 100644 --- a/lib/taurus/external/argparse/__init__.py +++ b/lib/taurus/external/argparse/__init__.py @@ -24,7 +24,7 @@ # ########################################################################### -from argparse import * # noqa: F403 +from argparse import * # noqa: F403,F401 from taurus.core.util import log as __log __log.deprecated(dep="taurus.external.argparse", rel="4.3.2", alt="argparse") diff --git a/lib/taurus/external/enum/__init__.py b/lib/taurus/external/enum/__init__.py index d9e062e3..170855e9 100644 --- a/lib/taurus/external/enum/__init__.py +++ b/lib/taurus/external/enum/__init__.py @@ -27,4 +27,4 @@ from taurus.core.util import log as __log __log.deprecated(dep="taurus.external.enum", rel="4.3.2", alt="enum") -from enum import * # noqa: F403,E402 +from enum import * # noqa: F403,E402,F401 diff --git a/lib/taurus/external/pint/__init__.py b/lib/taurus/external/pint/__init__.py index 4c3b832e..b4a0fb2d 100644 --- a/lib/taurus/external/pint/__init__.py +++ b/lib/taurus/external/pint/__init__.py @@ -32,5 +32,5 @@ __log.deprecated( alt="pint (for the module) or taurus.core.units (for UR and Q_)", ) -from pint import * # noqa: F403,E402 -from taurus.core.units import UR, Q_ # noqa: E402 +from pint import * # noqa: F403,E402,F401 +from taurus.core.units import UR, Q_ # noqa: E402,F401 diff --git a/lib/taurus/external/qt/Qt.py b/lib/taurus/external/qt/Qt.py index 82496445..fd055ce5 100644 --- a/lib/taurus/external/qt/Qt.py +++ b/lib/taurus/external/qt/Qt.py @@ -26,5 +26,5 @@ """This module exposes the Qt module """ -from .QtCore import * # noqa: F403 -from .QtGui import * # noqa: F403 +from .QtCore import * # noqa: F403,F401 +from .QtGui import * # noqa: F403,F401 diff --git a/lib/taurus/external/qt/QtCore.py b/lib/taurus/external/qt/QtCore.py index 27b05f8a..6b9021dc 100644 --- a/lib/taurus/external/qt/QtCore.py +++ b/lib/taurus/external/qt/QtCore.py @@ -38,11 +38,11 @@ def to_qvariant(pyobj=None): # -------------------------------------------------------------------------- if PYQT5: - from PyQt5.QtCore import * # noqa: F403 - from PyQt5.QtCore import pyqtSignal as Signal - from PyQt5.QtCore import pyqtSlot as Slot + from PyQt5.QtCore import * # noqa: F403,F401 + from PyQt5.QtCore import pyqtSignal as Signal # noqa: F401 + from PyQt5.QtCore import pyqtSlot as Slot # noqa: F401 from PyQt5.QtCore import pyqtProperty as Property - from PyQt5.QtCore import QT_VERSION_STR as __version__ + from PyQt5.QtCore import QT_VERSION_STR as __version__ # noqa: F401 # For issue #153 of qtpy from PyQt5.QtCore import QDateTime @@ -50,9 +50,9 @@ if PYQT5: QDateTime.toPython = QDateTime.toPyDateTime elif PYSIDE2: - from PySide2.QtCore import * # noqa: F403 - from PySide2.QtCore import Signal as pyqtSignal - from PySide2.QtCore import Slot as pyqtSlot + from PySide2.QtCore import * # noqa: F403,F401 + from PySide2.QtCore import Signal as pyqtSignal # noqa: F401 + from PySide2.QtCore import Slot as pyqtSlot # noqa: F401 # ------------------------------------------------ # Calling Property with doc="" produces segfaults in the tests. @@ -66,7 +66,7 @@ elif PYSIDE2: # ------------------------------------------------- try: # may be limited to PySide-5.11a1 only - from PySide2.QtGui import QStringListModel + from PySide2.QtGui import QStringListModel # noqa: F401 except Exception: pass diff --git a/lib/taurus/external/qt/QtDesigner.py b/lib/taurus/external/qt/QtDesigner.py index 1b012742..63bcd58f 100644 --- a/lib/taurus/external/qt/QtDesigner.py +++ b/lib/taurus/external/qt/QtDesigner.py @@ -13,7 +13,7 @@ from . import PYQT5, PythonQtError if PYQT5: - from PyQt5.QtDesigner import * # noqa: F403 + from PyQt5.QtDesigner import * # noqa: F403,F401 else: raise PythonQtError("No compatible Qt bindings could be found") diff --git a/lib/taurus/external/qt/QtGui.py b/lib/taurus/external/qt/QtGui.py index 70855721..51387055 100644 --- a/lib/taurus/external/qt/QtGui.py +++ b/lib/taurus/external/qt/QtGui.py @@ -12,22 +12,21 @@ Provides QtGui classes and functions. .. warning:: Contrary to qtpy.QtGui, this module exposes the namespace available in ``PyQt4.QtGui``. """ -import warnings from . import PYQT5, PYSIDE2, PythonQtError if PYQT5: - from PyQt5.QtGui import * # noqa: F403 + from PyQt5.QtGui import * # noqa: F403,F401 # import * from QtWidgets and QtPrintSupport for PyQt4 style compat - from PyQt5.QtWidgets import * # noqa: F403 - from PyQt5.QtPrintSupport import * # noqa: F403 + from PyQt5.QtWidgets import * # noqa: F403,F401 + from PyQt5.QtPrintSupport import * # noqa: F403,F401 elif PYSIDE2: - from PySide2.QtGui import * # noqa: F403 + from PySide2.QtGui import * # noqa: F403,F401 # import * from QtWidgets and QtPrintSupport for PyQt4 style compat - from PySide2.QtWidgets import * # noqa: F403 - from PySide2.QtPrintSupport import * # noqa: F403 + from PySide2.QtWidgets import * # noqa: F403,F401 + from PySide2.QtPrintSupport import * # noqa: F403,F401 else: raise PythonQtError("No Qt bindings could be found") diff --git a/lib/taurus/external/qt/QtHelp.py b/lib/taurus/external/qt/QtHelp.py index e49ee278..80d09e55 100644 --- a/lib/taurus/external/qt/QtHelp.py +++ b/lib/taurus/external/qt/QtHelp.py @@ -12,8 +12,8 @@ from . import PYQT5 from . import PYSIDE2 if PYQT5: - from PyQt5.QtHelp import * # noqa: F403 + from PyQt5.QtHelp import * # noqa: F403,F401 elif PYSIDE2: - from PySide2.QtHelp import * # noqa: F403 + from PySide2.QtHelp import * # noqa: F403,F401 del PYQT5, PYSIDE2 diff --git a/lib/taurus/external/qt/QtNetwork.py b/lib/taurus/external/qt/QtNetwork.py index 41d60f7a..a9e0e91b 100644 --- a/lib/taurus/external/qt/QtNetwork.py +++ b/lib/taurus/external/qt/QtNetwork.py @@ -14,8 +14,8 @@ from . import PYQT5, PYSIDE2, PythonQtError if PYQT5: - from PyQt5.QtNetwork import * # noqa: F403 + from PyQt5.QtNetwork import * # noqa: F403,F401 elif PYSIDE2: - from PySide2.QtNetwork import * # noqa: F403 + from PySide2.QtNetwork import * # noqa: F403,F401 else: raise PythonQtError("No Qt bindings could be found") diff --git a/lib/taurus/external/qt/QtSvg.py b/lib/taurus/external/qt/QtSvg.py index e116e100..9af0b6bf 100644 --- a/lib/taurus/external/qt/QtSvg.py +++ b/lib/taurus/external/qt/QtSvg.py @@ -12,9 +12,9 @@ from . import PYSIDE2, PYQT5, PythonQtError if PYQT5: - from PyQt5.QtSvg import * # noqa: F403 + from PyQt5.QtSvg import * # noqa: F403,F401 elif PYSIDE2: - from PySide2.QtSvg import * # noqa: F403 + from PySide2.QtSvg import * # noqa: F403,F401 else: raise PythonQtError("No Qt bindings could be found") diff --git a/lib/taurus/external/qt/QtUiTools.py b/lib/taurus/external/qt/QtUiTools.py index 09a1eb09..6172178b 100644 --- a/lib/taurus/external/qt/QtUiTools.py +++ b/lib/taurus/external/qt/QtUiTools.py @@ -39,6 +39,6 @@ __log.deprecated( ) if PYSIDE2: - from PySide2.QtUiTools import * # noqa: F403 + from PySide2.QtUiTools import * # noqa: F403,F401 else: raise ImportError("QtUiTools not supported for {}".format(API_NAME)) diff --git a/lib/taurus/external/qt/QtWebKit.py b/lib/taurus/external/qt/QtWebKit.py index c4484a20..0409a584 100644 --- a/lib/taurus/external/qt/QtWebKit.py +++ b/lib/taurus/external/qt/QtWebKit.py @@ -30,14 +30,14 @@ from . import PYQT5, PYSIDE2, PythonQtError if PYQT5: - from PyQt5.QtWebKit import * # noqa: F403 + from PyQt5.QtWebKit import * # noqa: F403,F401 # import * from QtWebkitWidgets for PyQt4 style compat - from PyQt5.QtWebKitWidgets import * # noqa: F403 + from PyQt5.QtWebKitWidgets import * # noqa: F403,F401 elif PYSIDE2: - from PySide2.QtWebKit import * # noqa: F403 + from PySide2.QtWebKit import * # noqa: F403,F401 # import * from QtWebkitWidgets for PyQt4 style compat - from PySide2.QtWebKitWidgets import * # noqa: F403 + from PySide2.QtWebKitWidgets import * # noqa: F403,F401 else: raise PythonQtError("No Qt bindings could be found") diff --git a/lib/taurus/external/qt/QtWidgets.py b/lib/taurus/external/qt/QtWidgets.py index 3a86cac2..fa540454 100644 --- a/lib/taurus/external/qt/QtWidgets.py +++ b/lib/taurus/external/qt/QtWidgets.py @@ -14,11 +14,11 @@ Provides widget classes and functions. """ from . import PYQT5, PYSIDE2, PythonQtError -from taurus.core.util import log as __log +from taurus.core.util import log as __log # noqa: F401 if PYQT5: - from PyQt5.QtWidgets import * # noqa: F403 + from PyQt5.QtWidgets import * # noqa: F403,F401 elif PYSIDE2: - from PySide2.QtWidgets import * # noqa: F403 + from PySide2.QtWidgets import * # noqa: F403,F401 else: raise PythonQtError("No Qt bindings could be found") diff --git a/lib/taurus/external/qt/uic.py b/lib/taurus/external/qt/uic.py index bfb2dfd7..0017df90 100644 --- a/lib/taurus/external/qt/uic.py +++ b/lib/taurus/external/qt/uic.py @@ -64,7 +64,7 @@ from . import PYSIDE2, PYQT5 if PYQT5: - from PyQt5.uic import * # noqa: F403 + from PyQt5.uic import * # noqa: F403,F401 else: @@ -162,7 +162,6 @@ else: widget classes. """ - import sys import importlib from xml.etree.ElementTree import ElementTree diff --git a/lib/taurus/external/unittest/__init__.py b/lib/taurus/external/unittest/__init__.py index 6f47e91f..b158cb3d 100644 --- a/lib/taurus/external/unittest/__init__.py +++ b/lib/taurus/external/unittest/__init__.py @@ -28,4 +28,4 @@ from taurus.core.util import log as __log __log.deprecated(dep="taurus.external.unittest", rel="4.3.2", alt="unittest") -from unittest import * # noqa: F403,E402 +from unittest import * # noqa: F403,E402,F401 diff --git a/lib/taurus/qt/__init__.py b/lib/taurus/qt/__init__.py index e7a56d0a..861824bf 100644 --- a/lib/taurus/qt/__init__.py +++ b/lib/taurus/qt/__init__.py @@ -28,4 +28,4 @@ __docformat__ = "restructuredtext" -from taurus.external import qt as __qt +from taurus.external import qt as __qt # noqa: F401 diff --git a/lib/taurus/qt/qtcore/communication/__init__.py b/lib/taurus/qt/qtcore/communication/__init__.py index 26b13abc..b2fee745 100644 --- a/lib/taurus/qt/qtcore/communication/__init__.py +++ b/lib/taurus/qt/qtcore/communication/__init__.py @@ -27,4 +27,4 @@ of taurus.qt """ -from .communication import * # noqa: F403 +from .communication import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtcore/configuration/__init__.py b/lib/taurus/qt/qtcore/configuration/__init__.py index a988b392..afa42e30 100644 --- a/lib/taurus/qt/qtcore/configuration/__init__.py +++ b/lib/taurus/qt/qtcore/configuration/__init__.py @@ -27,4 +27,4 @@ configuration features to the classes that inherit from them """ -from .configuration import * # noqa: F403 +from .configuration import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtcore/mimetypes/__init__.py b/lib/taurus/qt/qtcore/mimetypes/__init__.py index 1167e0ce..5e43c2a9 100644 --- a/lib/taurus/qt/qtcore/mimetypes/__init__.py +++ b/lib/taurus/qt/qtcore/mimetypes/__init__.py @@ -26,4 +26,4 @@ """contains MIME type definitions used by taurus widgets """ -from .mimetypes import * # noqa: F403 +from .mimetypes import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtcore/model/__init__.py b/lib/taurus/qt/qtcore/model/__init__.py index 74a0dfa7..9cc77c06 100644 --- a/lib/taurus/qt/qtcore/model/__init__.py +++ b/lib/taurus/qt/qtcore/model/__init__.py @@ -53,8 +53,8 @@ And now inside a :class:`PyQt.Qt.QComboBox`:: view.setModel(model) """ -from .taurusmodel import * # noqa: F403 -from .taurusdatabasemodel import * # noqa: F403 +from .taurusmodel import * # noqa: F403,F401 +from .taurusdatabasemodel import * # noqa: F403,F401 __docformat__ = "restructuredtext" diff --git a/lib/taurus/qt/qtcore/util/__init__.py b/lib/taurus/qt/qtcore/util/__init__.py index 5179ec4b..e1d22e8c 100644 --- a/lib/taurus/qt/qtcore/util/__init__.py +++ b/lib/taurus/qt/qtcore/util/__init__.py @@ -26,7 +26,7 @@ """This package provides a set of utilities (e.g. logging) to taurus qtcore """ -from .tauruslog import * # noqa: F403 -from .signal import baseSignal +from .tauruslog import * # noqa: F403,F401 +from .signal import baseSignal # noqa: F401 __docformat__ = "restructuredtext" diff --git a/lib/taurus/qt/qtdesigner/taurusplugin/__init__.py b/lib/taurus/qt/qtdesigner/taurusplugin/__init__.py index 41142eab..a3aa2de1 100644 --- a/lib/taurus/qt/qtdesigner/taurusplugin/__init__.py +++ b/lib/taurus/qt/qtdesigner/taurusplugin/__init__.py @@ -28,4 +28,4 @@ __docformat__ = "restructuredtext" -from .taurusplugin import * # noqa: F403 +from .taurusplugin import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/application/__init__.py b/lib/taurus/qt/qtgui/application/__init__.py index ac330548..19dfc30a 100644 --- a/lib/taurus/qt/qtgui/application/__init__.py +++ b/lib/taurus/qt/qtgui/application/__init__.py @@ -28,4 +28,4 @@ __docformat__ = "restructuredtext" -from .taurusapplication import * # noqa: F403 +from .taurusapplication import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/base/__init__.py b/lib/taurus/qt/qtgui/base/__init__.py index 07589ea0..c6898cef 100644 --- a/lib/taurus/qt/qtgui/base/__init__.py +++ b/lib/taurus/qt/qtgui/base/__init__.py @@ -28,5 +28,5 @@ widgets should inherit to be considered valid taurus widgets. """ __docformat__ = "restructuredtext" -from .taurusbase import * # noqa: F403 -from .tauruscontroller import * # noqa: F403 +from .taurusbase import * # noqa: F403,F401 +from .tauruscontroller import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/base/taurusbase.py b/lib/taurus/qt/qtgui/base/taurusbase.py index c8136aad..5abae9b1 100644 --- a/lib/taurus/qt/qtgui/base/taurusbase.py +++ b/lib/taurus/qt/qtgui/base/taurusbase.py @@ -36,7 +36,6 @@ from taurus.external.qt import Qt from enum import Enum import taurus -from taurus import warning from taurus.core.util import eventfilters from taurus.core.util.timer import Timer from taurus.core.taurusbasetypes import TaurusElementType, TaurusEventType @@ -1522,7 +1521,6 @@ class TaurusBaseWidget(TaurusBaseComponent): # add formatters from plugins known_formatters = TaurusBaseWidget.get_registered_formatters() # add default formatter - from taurus import tauruscustomsettings default = getattr( taurus.tauruscustomsettings, "DEFAULT_FORMATTER", defaultFormatter diff --git a/lib/taurus/qt/qtgui/base/test/test_taurusbase.py b/lib/taurus/qt/qtgui/base/test/test_taurusbase.py index 7af4970b..928f50c9 100644 --- a/lib/taurus/qt/qtgui/base/test/test_taurusbase.py +++ b/lib/taurus/qt/qtgui/base/test/test_taurusbase.py @@ -34,7 +34,7 @@ from taurus.test.pytest import check_taurus_deprecations try: # The following are Tango-centric imports. - from taurus.core.tango.test import nodb_dev # pytest fixture + from taurus.core.tango.test import nodb_dev # noqa: F401 _TANGO_MISSING = False except Exception: diff --git a/lib/taurus/qt/qtgui/button/__init__.py b/lib/taurus/qt/qtgui/button/__init__.py index 766cb8ed..a941dd0a 100644 --- a/lib/taurus/qt/qtgui/button/__init__.py +++ b/lib/taurus/qt/qtgui/button/__init__.py @@ -28,5 +28,5 @@ __docformat__ = "restructuredtext" -from .qbuttonbox import * # noqa: F403 -from .taurusbutton import * # noqa: F403 +from .qbuttonbox import * # noqa: F403,F401 +from .taurusbutton import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/button/test/test_commandbutton.py b/lib/taurus/qt/qtgui/button/test/test_commandbutton.py index 92feec5d..24308126 100644 --- a/lib/taurus/qt/qtgui/button/test/test_commandbutton.py +++ b/lib/taurus/qt/qtgui/button/test/test_commandbutton.py @@ -36,7 +36,7 @@ try: # The following are Tango-centric imports. # TODO: change them if/when TaurusCommandbutton gets generalized from PyTango import CommunicationFailed - from taurus.core.tango.test import nodb_dev # pytest fixture + from taurus.core.tango.test import nodb_dev # noqa: F401 _TANGO_MISSING = False except Exception: diff --git a/lib/taurus/qt/qtgui/compact/__init__.py b/lib/taurus/qt/qtgui/compact/__init__.py index a727fe38..cc0e963b 100644 --- a/lib/taurus/qt/qtgui/compact/__init__.py +++ b/lib/taurus/qt/qtgui/compact/__init__.py @@ -28,5 +28,5 @@ widgets to provide several functionalities in a reduced space """ __docformat__ = "restructuredtext" -from .abstractswitcher import * # noqa: F403 -from .basicswitcher import * # noqa: F403 +from .abstractswitcher import * # noqa: F403,F401 +from .basicswitcher import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/container/__init__.py b/lib/taurus/qt/qtgui/container/__init__.py index 24472369..3f80b307 100644 --- a/lib/taurus/qt/qtgui/container/__init__.py +++ b/lib/taurus/qt/qtgui/container/__init__.py @@ -28,11 +28,11 @@ __docformat__ = "restructuredtext" -from .qcontainer import * # noqa: F403 -from .taurusbasecontainer import * # noqa: F403 -from .taurusframe import * # noqa: F403 -from .tauruswidget import * # noqa: F403 -from .taurusgroupbox import * # noqa: F403 -from .taurusgroupwidget import * # noqa: F403 -from .taurusscrollarea import * # noqa: F403 -from .taurusmainwindow import * # noqa: F403 +from .qcontainer import * # noqa: F403,F401 +from .taurusbasecontainer import * # noqa: F403,F401 +from .taurusframe import * # noqa: F403,F401 +from .tauruswidget import * # noqa: F403,F401 +from .taurusgroupbox import * # noqa: F403,F401 +from .taurusgroupwidget import * # noqa: F403,F401 +from .taurusscrollarea import * # noqa: F403,F401 +from .taurusmainwindow import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/dialog/__init__.py b/lib/taurus/qt/qtgui/dialog/__init__.py index e94960b8..b125e518 100644 --- a/lib/taurus/qt/qtgui/dialog/__init__.py +++ b/lib/taurus/qt/qtgui/dialog/__init__.py @@ -29,5 +29,5 @@ panels like forms or panels to be inserted in dialogs __docformat__ = "restructuredtext" -from .taurusmessagebox import * # noqa: F403 -from .taurusinputdialog import * # noqa: F403 +from .taurusmessagebox import * # noqa: F403,F401 +from .taurusinputdialog import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/dialog/taurusmessagebox.py b/lib/taurus/qt/qtgui/dialog/taurusmessagebox.py index aa2a4f4b..69d6c0d4 100644 --- a/lib/taurus/qt/qtgui/dialog/taurusmessagebox.py +++ b/lib/taurus/qt/qtgui/dialog/taurusmessagebox.py @@ -305,8 +305,6 @@ class TaurusExceptHookMessageBox(BaseExceptHook): def report(self, *exc_info): app = Qt.QApplication.instance() if app is None: - import taurus.core.util - LogExceptHook().report(*exc_info) return msgbox = self._getMessageBox(*exc_info) diff --git a/lib/taurus/qt/qtgui/display/__init__.py b/lib/taurus/qt/qtgui/display/__init__.py index 2e94783c..3e87b6cf 100644 --- a/lib/taurus/qt/qtgui/display/__init__.py +++ b/lib/taurus/qt/qtgui/display/__init__.py @@ -30,11 +30,11 @@ possible). Examples of widgets that suite this rule are labels, leds and LCDs __docformat__ = "restructuredtext" -from .qfallback import * # noqa: F403 -from .qpixmapwidget import * # noqa: F403 -from .qled import * # noqa: F403 -from .qlogo import * # noqa: F403 -from .qsevensegment import * # noqa: F403 -from .tauruslabel import * # noqa: F403 -from .taurusled import * # noqa: F403 -from .tauruslcd import * # noqa: F403 +from .qfallback import * # noqa: F403,F401 +from .qpixmapwidget import * # noqa: F403,F401 +from .qled import * # noqa: F403,F401 +from .qlogo import * # noqa: F403,F401 +from .qsevensegment import * # noqa: F403,F401 +from .tauruslabel import * # noqa: F403,F401 +from .taurusled import * # noqa: F403,F401 +from .tauruslcd import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/display/test/test_tauruslabel.py b/lib/taurus/qt/qtgui/display/test/test_tauruslabel.py index f21537a9..4e68b9f0 100644 --- a/lib/taurus/qt/qtgui/display/test/test_tauruslabel.py +++ b/lib/taurus/qt/qtgui/display/test/test_tauruslabel.py @@ -38,7 +38,7 @@ import pytest try: # The following are Tango-centric imports. - from taurus.core.tango.test import nodb_dev # pytest fixture + from taurus.core.tango.test import nodb_dev # noqa: F401 _TANGO_MISSING = False except Exception: diff --git a/lib/taurus/qt/qtgui/editor/__init__.py b/lib/taurus/qt/qtgui/editor/__init__.py index 8b8d6d43..f69041a0 100644 --- a/lib/taurus/qt/qtgui/editor/__init__.py +++ b/lib/taurus/qt/qtgui/editor/__init__.py @@ -29,7 +29,7 @@ __docformat__ = "restructuredtext" try: - from .tauruseditor import * # noqa: F403 + from .tauruseditor import * # noqa: F403,F401 except Exception as e: from taurus import warning, debug diff --git a/lib/taurus/qt/qtgui/extra_guiqwt/__init__.py b/lib/taurus/qt/qtgui/extra_guiqwt/__init__.py index 74770a54..1612234b 100644 --- a/lib/taurus/qt/qtgui/extra_guiqwt/__init__.py +++ b/lib/taurus/qt/qtgui/extra_guiqwt/__init__.py @@ -28,5 +28,9 @@ provides taurus extensions to qwtgui """ __docformat__ = "restructuredtext" -from .plot import TaurusImageDialog, TaurusCurveDialog, TaurusTrendDialog -from .taurustrend2d import TaurusTrend2DDialog +from .plot import ( # noqa: F401 + TaurusImageDialog, + TaurusCurveDialog, + TaurusTrendDialog, +) +from .taurustrend2d import TaurusTrend2DDialog # noqa: F401 diff --git a/lib/taurus/qt/qtgui/extra_guiqwt/builder.py b/lib/taurus/qt/qtgui/extra_guiqwt/builder.py index 591fc49e..483bb675 100644 --- a/lib/taurus/qt/qtgui/extra_guiqwt/builder.py +++ b/lib/taurus/qt/qtgui/extra_guiqwt/builder.py @@ -38,7 +38,7 @@ from .image import ( TaurusXYImageItem, ) from guiqwt.curve import CurveParam -from guiqwt.image import ImageParam, XYImageItem +from guiqwt.image import ImageParam from guiqwt.styles import XYImageParam from guiqwt.config import _ from guiqwt.histogram import lut_range_threshold diff --git a/lib/taurus/qt/qtgui/extra_guiqwt/curve.py b/lib/taurus/qt/qtgui/extra_guiqwt/curve.py index 81dc6400..1535096e 100644 --- a/lib/taurus/qt/qtgui/extra_guiqwt/curve.py +++ b/lib/taurus/qt/qtgui/extra_guiqwt/curve.py @@ -26,7 +26,6 @@ """Extension of :mod:`guiqwt.curve` """ -from taurus.external.qt import Qt from taurus.qt.qtgui.base import TaurusBaseComponent from taurus.qt.qtcore.util import baseSignal import taurus @@ -283,7 +282,6 @@ class TaurusTrendItem(CurveItem, TaurusBaseComponent): def taurusTrendMain(): - from taurus.qt.qtgui.extra_guiqwt.builder import make from taurus.qt.qtgui.application import TaurusApplication from guiqwt.plot import CurveDialog from guiqwt.tools import HRangeTool diff --git a/lib/taurus/qt/qtgui/extra_guiqwt/image.py b/lib/taurus/qt/qtgui/extra_guiqwt/image.py index 53a2f7fe..9f22d990 100644 --- a/lib/taurus/qt/qtgui/extra_guiqwt/image.py +++ b/lib/taurus/qt/qtgui/extra_guiqwt/image.py @@ -36,14 +36,13 @@ __all__ = [ ] from taurus.core.units import Quantity -from taurus.external.qt import Qt from taurus.qt.qtgui.base import TaurusBaseComponent from taurus.qt.qtcore.util import baseSignal import taurus.core from taurus.core.util.containers import ArrayBuffer from guiqwt.image import ImageItem, RGBImageItem, XYImageItem -from guiqwt.image import INTERP_NEAREST, INTERP_LINEAR +from guiqwt.image import INTERP_NEAREST import numpy @@ -634,7 +633,7 @@ class TaurusTrend2DScanItem(TaurusTrend2DItem): def taurusImageMain(): - from guiqwt.tools import ( + from guiqwt.tools import ( # noqa: F401 RectangleTool, EllipseTool, HRangeTool, @@ -666,7 +665,6 @@ def taurusImageMain(): from taurus.qt.qtgui.extra_guiqwt.builder import make from taurus.qt.qtgui.application import TaurusApplication import taurus.core.util.argparse - import sys parser = taurus.core.util.argparse.get_taurus_parser() parser.set_usage("%prog [options] [<model1> [<model2>] ...]") diff --git a/lib/taurus/qt/qtgui/extra_nexus/__init__.py b/lib/taurus/qt/qtgui/extra_nexus/__init__.py index 372f4552..d7323dfc 100644 --- a/lib/taurus/qt/qtgui/extra_nexus/__init__.py +++ b/lib/taurus/qt/qtgui/extra_nexus/__init__.py @@ -27,4 +27,4 @@ __init__.py: """ -from .taurusnexuswidget import TaurusNeXusBrowser +from .taurusnexuswidget import TaurusNeXusBrowser # noqa: F401 diff --git a/lib/taurus/qt/qtgui/graphic/__init__.py b/lib/taurus/qt/qtgui/graphic/__init__.py index ac6183b5..7d9a68b3 100644 --- a/lib/taurus/qt/qtgui/graphic/__init__.py +++ b/lib/taurus/qt/qtgui/graphic/__init__.py @@ -28,11 +28,11 @@ __docformat__ = "restructuredtext" -from .taurusgraphic import * # noqa: F403 -from .taurusgraphicview import * # noqa: F403 +from .taurusgraphic import * # noqa: F403,F401 +from .taurusgraphicview import * # noqa: F403,F401 try: - from .jdraw import * # noqa: F403 + from .jdraw import * # noqa: F403,F401 except Exception: import taurus.core.util.log diff --git a/lib/taurus/qt/qtgui/graphic/jdraw/__init__.py b/lib/taurus/qt/qtgui/graphic/jdraw/__init__.py index d92fa674..e62e8f53 100644 --- a/lib/taurus/qt/qtgui/graphic/jdraw/__init__.py +++ b/lib/taurus/qt/qtgui/graphic/jdraw/__init__.py @@ -28,5 +28,5 @@ __docformat__ = "restructuredtext" -from .jdraw import * # noqa: F403 -from .jdraw_view import TaurusJDrawSynopticsView # * +from .jdraw import * # noqa: F403,F401 +from .jdraw_view import TaurusJDrawSynopticsView # noqa: F401 diff --git a/lib/taurus/qt/qtgui/graphic/jdraw/jdraw_view.py b/lib/taurus/qt/qtgui/graphic/jdraw/jdraw_view.py index caf71b00..96d96252 100644 --- a/lib/taurus/qt/qtgui/graphic/jdraw/jdraw_view.py +++ b/lib/taurus/qt/qtgui/graphic/jdraw/jdraw_view.py @@ -564,7 +564,6 @@ class TaurusJDrawSynopticsView(Qt.QGraphicsView, TaurusBaseWidget): def jdraw_view_main(): import sys - import time import taurus.qt.qtgui.graphic taurus.setLogLevel(taurus.Info) diff --git a/lib/taurus/qt/qtgui/help/__init__.py b/lib/taurus/qt/qtgui/help/__init__.py index cc02368a..3abc6e68 100644 --- a/lib/taurus/qt/qtgui/help/__init__.py +++ b/lib/taurus/qt/qtgui/help/__init__.py @@ -29,6 +29,6 @@ provide a way to browse through the application help system __docformat__ = "restructuredtext" -from .assistant import * # noqa: F403 -from .aboutdialog import * # noqa: F403 -from .helppanel import * # noqa: F403 +from .assistant import * # noqa: F403,F401 +from .aboutdialog import * # noqa: F403,F401 +from .helppanel import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/icon/__init__.py b/lib/taurus/qt/qtgui/icon/__init__.py index aa31dcc9..27f845bb 100644 --- a/lib/taurus/qt/qtgui/icon/__init__.py +++ b/lib/taurus/qt/qtgui/icon/__init__.py @@ -28,5 +28,5 @@ Utilities for using the bundled icons in Taurus and for registering external sources of icons. """ -from .icon import * # noqa: F403 -from .catalog import QIconCatalog +from .icon import * # noqa: F403,F401 +from .catalog import QIconCatalog # noqa: F401 diff --git a/lib/taurus/qt/qtgui/input/__init__.py b/lib/taurus/qt/qtgui/input/__init__.py index 7f195a66..778d6420 100644 --- a/lib/taurus/qt/qtgui/input/__init__.py +++ b/lib/taurus/qt/qtgui/input/__init__.py @@ -28,10 +28,10 @@ interact with the user. Examples are line edits, comboboxes and checkboxes """ __docformat__ = "restructuredtext" -from .qwheel import * # noqa: F403 -from .tauruscheckbox import * # noqa: F403 -from .tauruscombobox import * # noqa: F403 -from .tauruslineedit import * # noqa: F403 -from .taurusspinbox import * # noqa: F403 -from .tauruswheel import * # noqa: F403 -from .choicedlg import * # noqa: F403 +from .qwheel import * # noqa: F403,F401 +from .tauruscheckbox import * # noqa: F403,F401 +from .tauruscombobox import * # noqa: F403,F401 +from .tauruslineedit import * # noqa: F403,F401 +from .taurusspinbox import * # noqa: F403,F401 +from .tauruswheel import * # noqa: F403,F401 +from .choicedlg import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/input/qwheel.py b/lib/taurus/qt/qtgui/input/qwheel.py index 7080d8b4..5ed13dee 100644 --- a/lib/taurus/qt/qtgui/input/qwheel.py +++ b/lib/taurus/qt/qtgui/input/qwheel.py @@ -986,7 +986,8 @@ class QWheelEdit(Qt.QFrame): def main(): - import taurus.qt.qtgui.icon # otherwise the arrows don't show in the demo + # unused import to initialize the icons + import taurus.qt.qtgui.icon # noqa: F401 global arrowWidget diff --git a/lib/taurus/qt/qtgui/input/test/test_tauruscombobox.py b/lib/taurus/qt/qtgui/input/test/test_tauruscombobox.py index f8ef98ff..674cb352 100644 --- a/lib/taurus/qt/qtgui/input/test/test_tauruscombobox.py +++ b/lib/taurus/qt/qtgui/input/test/test_tauruscombobox.py @@ -1,4 +1,3 @@ -from taurus.qt.qtgui.application import TaurusApplication from taurus.qt.qtgui.input import TaurusValueComboBox from taurus.core.units import UR import taurus @@ -7,7 +6,7 @@ from taurus.external.qt import PYSIDE2 try: # The following are Tango-centric imports. - from taurus.core.tango.test import nodb_dev # pytest fixture + from taurus.core.tango.test import nodb_dev # noqa: F401 _TANGO_MISSING = False except Exception: diff --git a/lib/taurus/qt/qtgui/model/__init__.py b/lib/taurus/qt/qtgui/model/__init__.py index c26cd104..25817d98 100644 --- a/lib/taurus/qt/qtgui/model/__init__.py +++ b/lib/taurus/qt/qtgui/model/__init__.py @@ -28,4 +28,4 @@ __docformat__ = "restructuredtext" -from .qbasemodel import * # noqa: F403 +from .qbasemodel import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/panel/__init__.py b/lib/taurus/qt/qtgui/panel/__init__.py index 281c90ab..0f73e256 100644 --- a/lib/taurus/qt/qtgui/panel/__init__.py +++ b/lib/taurus/qt/qtgui/panel/__init__.py @@ -29,15 +29,15 @@ panels like forms or panels to be inserted in dialogs __docformat__ = "restructuredtext" -from .qrawdatachooser import * # noqa: F403 -from .qdataexportdialog import * # noqa: F403 -from .taurusmessagepanel import * # noqa: F403 -from .taurusinputpanel import * # noqa: F403 -from .taurusmodelchooser import * # noqa: F403 -from .taurusvalue import * # noqa: F403 -from .taurusform import * # noqa: F403 -from .taurusmodellist import * # noqa: F403 -from .taurusconfigeditor import * # noqa: F403 -from .qdoublelist import * # noqa: F403 -from .taurusdevicepanel import * # noqa: F403 -from .taurusconfigurationpanel import * # noqa: F403 +from .qrawdatachooser import * # noqa: F403,F401 +from .qdataexportdialog import * # noqa: F403,F401 +from .taurusmessagepanel import * # noqa: F403,F401 +from .taurusinputpanel import * # noqa: F403,F401 +from .taurusmodelchooser import * # noqa: F403,F401 +from .taurusvalue import * # noqa: F403,F401 +from .taurusform import * # noqa: F403,F401 +from .taurusmodellist import * # noqa: F403,F401 +from .taurusconfigeditor import * # noqa: F403,F401 +from .qdoublelist import * # noqa: F403,F401 +from .taurusdevicepanel import * # noqa: F403,F401 +from .taurusconfigurationpanel import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/panel/taurusdevicepanel.py b/lib/taurus/qt/qtgui/panel/taurusdevicepanel.py index 18f1d3f7..bce4bef9 100644 --- a/lib/taurus/qt/qtgui/panel/taurusdevicepanel.py +++ b/lib/taurus/qt/qtgui/panel/taurusdevicepanel.py @@ -35,7 +35,7 @@ import taurus from taurus.external.qt import Qt from taurus import tauruscustomsettings -from taurus.core.taurusbasetypes import TaurusDevState, TaurusElementType +from taurus.core.taurusbasetypes import TaurusElementType from taurus.core.taurusattribute import TaurusAttribute from taurus.core.taurusdevice import TaurusDevice from taurus.qt.qtgui.container import TaurusWidget diff --git a/lib/taurus/qt/qtgui/panel/taurusvalue.py b/lib/taurus/qt/qtgui/panel/taurusvalue.py index a26a70f1..ea989b05 100644 --- a/lib/taurus/qt/qtgui/panel/taurusvalue.py +++ b/lib/taurus/qt/qtgui/panel/taurusvalue.py @@ -607,7 +607,7 @@ class TaurusValue(Qt.QWidget, TaurusBaseWidget): try: # unused import but useful to determine if # TaurusImageButton should be added - from taurus.qt.qtgui.extra_guiqwt import ( + from taurus.qt.qtgui.extra_guiqwt import ( # noqa TaurusImageDialog, ) diff --git a/lib/taurus/qt/qtgui/panel/test/test_taurusform.py b/lib/taurus/qt/qtgui/panel/test/test_taurusform.py index f1942a8e..99f73482 100644 --- a/lib/taurus/qt/qtgui/panel/test/test_taurusform.py +++ b/lib/taurus/qt/qtgui/panel/test/test_taurusform.py @@ -31,7 +31,7 @@ import pytest try: # The following are Tango-centric imports. - from taurus.core.tango.test import nodb_dev # pytest fixture + from taurus.core.tango.test import nodb_dev # noqa: F401 _TANGO_MISSING = False except Exception: diff --git a/lib/taurus/qt/qtgui/panel/test/test_taurusvalue.py b/lib/taurus/qt/qtgui/panel/test/test_taurusvalue.py index a935e668..b314fdba 100644 --- a/lib/taurus/qt/qtgui/panel/test/test_taurusvalue.py +++ b/lib/taurus/qt/qtgui/panel/test/test_taurusvalue.py @@ -32,7 +32,7 @@ from taurus.test.pytest import check_taurus_deprecations try: # The following are Tango-centric imports. - from taurus.core.tango.test import nodb_dev # pytest fixture + from taurus.core.tango.test import nodb_dev # noqa: F401 _TANGO_MISSING = False except Exception: diff --git a/lib/taurus/qt/qtgui/plot/__init__.py b/lib/taurus/qt/qtgui/plot/__init__.py index d6670a33..9e03703c 100644 --- a/lib/taurus/qt/qtgui/plot/__init__.py +++ b/lib/taurus/qt/qtgui/plot/__init__.py @@ -45,7 +45,7 @@ __log.deprecated(dep="taurus.qt.qtgui.plot", rel="4.5", alt="taurus_pyqtgraph") try: - from taurus_pyqtgraph import TaurusPlot, TaurusTrend + from taurus_pyqtgraph import TaurusPlot, TaurusTrend # noqa: F401 __log.info( "plot: Using taurus_pyqtgraph to provide a minimal API " diff --git a/lib/taurus/qt/qtgui/resource/__init__.py b/lib/taurus/qt/qtgui/resource/__init__.py index 3713a0ba..53a19afb 100644 --- a/lib/taurus/qt/qtgui/resource/__init__.py +++ b/lib/taurus/qt/qtgui/resource/__init__.py @@ -34,4 +34,4 @@ __deprecated( dep="taurus.qt.qtgui.resource", alt="taurus.qt.qtgui.icon", rel="4.0" ) -from .taurus_resource_utils import * # noqa: F403,E402 +from .taurus_resource_utils import * # noqa: F403,E402,F401 diff --git a/lib/taurus/qt/qtgui/resource/taurus_resource_utils.py b/lib/taurus/qt/qtgui/resource/taurus_resource_utils.py index e27d5079..20af909d 100644 --- a/lib/taurus/qt/qtgui/resource/taurus_resource_utils.py +++ b/lib/taurus/qt/qtgui/resource/taurus_resource_utils.py @@ -56,7 +56,7 @@ from taurus.core.util.log import ( deprecation_decorator, ) -from taurus.qt.qtgui.icon import * # noqa: F403 +from taurus.qt.qtgui.icon import * # noqa: F403,F401 @deprecation_decorator( diff --git a/lib/taurus/qt/qtgui/style/nebula.py b/lib/taurus/qt/qtgui/style/nebula.py index 2c92188b..992036eb 100644 --- a/lib/taurus/qt/qtgui/style/nebula.py +++ b/lib/taurus/qt/qtgui/style/nebula.py @@ -30,7 +30,6 @@ __all__ = ["getStyle", "getStyleSheet"] __docformat__ = "restructuredtext" -from taurus.external.qt import Qt _NEBULA_KEYS = { "border_radius": "4px", diff --git a/lib/taurus/qt/qtgui/table/__init__.py b/lib/taurus/qt/qtgui/table/__init__.py index 245182c8..4df947be 100644 --- a/lib/taurus/qt/qtgui/table/__init__.py +++ b/lib/taurus/qt/qtgui/table/__init__.py @@ -28,11 +28,11 @@ __docformat__ = "restructuredtext" -from .qtable import * # noqa: F403 -from .qlogtable import * # noqa: F403 -from .taurustable import * # noqa: F403 -from .taurusdbtable import * # noqa: F403 -from .taurusvaluestable import * # noqa: F403 -from .taurusdevicepropertytable import * # noqa: F403 -from .taurusgrid import * # noqa: F403 -from .qdictionary import * # noqa: F403 +from .qtable import * # noqa: F403,F401 +from .qlogtable import * # noqa: F403,F401 +from .taurustable import * # noqa: F403,F401 +from .taurusdbtable import * # noqa: F403,F401 +from .taurusvaluestable import * # noqa: F403,F401 +from .taurusdevicepropertytable import * # noqa: F403,F401 +from .taurusgrid import * # noqa: F403,F401 +from .qdictionary import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/table/qdictionary.py b/lib/taurus/qt/qtgui/table/qdictionary.py index 32151224..26924b83 100644 --- a/lib/taurus/qt/qtgui/table/qdictionary.py +++ b/lib/taurus/qt/qtgui/table/qdictionary.py @@ -30,8 +30,8 @@ import sys from taurus.core.util.containers import SortedDict from taurus.external.qt import Qt -from taurus.qt.qtgui.container import TaurusBaseContainer, TaurusWidget -from taurus.qt.qtcore.util.properties import join, djoin +from taurus.qt.qtgui.container import TaurusBaseContainer +from taurus.qt.qtcore.util.properties import djoin __all__ = ["QDictionaryEditor", "QListEditor"] diff --git a/lib/taurus/qt/qtgui/table/taurusdbtable.py b/lib/taurus/qt/qtgui/table/taurusdbtable.py index a389e8cc..51d11579 100644 --- a/lib/taurus/qt/qtgui/table/taurusdbtable.py +++ b/lib/taurus/qt/qtgui/table/taurusdbtable.py @@ -31,7 +31,7 @@ model in a table widget from taurus.external.qt import Qt from taurus.core.taurusbasetypes import TaurusElementType -from taurus.qt.qtcore.model import * # noqa: F403 +from taurus.qt.qtcore.model import * # noqa: F403,F401 from taurus.core.taurusauthority import TaurusAuthority from taurus.qt.qtgui.icon import getElementTypeIcon, getElementTypeIconName from .taurustable import TaurusBaseTableWidget diff --git a/lib/taurus/qt/qtgui/table/taurusgrid.py b/lib/taurus/qt/qtgui/table/taurusgrid.py index 81538cbd..c6f5c60c 100644 --- a/lib/taurus/qt/qtgui/table/taurusgrid.py +++ b/lib/taurus/qt/qtgui/table/taurusgrid.py @@ -112,9 +112,7 @@ def get_all_models(expressions, limit=1000): attribute = attribute.replace("*", ".*") try: taurus_dp = ( - taurus.core.taurusmanager.TaurusManager() - .getFactory()() - .getDevice(dev) + TaurusManager().getFactory()().getDevice(dev) ) # self.debug( "taurus_dp = %s"%taurus_dp.getFullName()) attrs = [ @@ -180,9 +178,7 @@ def get_readwrite_models(expressions, limit=1000): attribute = attribute.replace("*", ".*") try: taurus_dp = ( - taurus.core.taurusmanager.TaurusManager() - .getFactory()() - .getDevice(dev) + TaurusManager().getFactory()().getDevice(dev) ) attrs = [ att.name diff --git a/lib/taurus/qt/qtgui/table/taurusvaluestable.py b/lib/taurus/qt/qtgui/table/taurusvaluestable.py index 6c836296..ccc112fb 100644 --- a/lib/taurus/qt/qtgui/table/taurusvaluestable.py +++ b/lib/taurus/qt/qtgui/table/taurusvaluestable.py @@ -38,7 +38,6 @@ from taurus.core.taurusbasetypes import ( from taurus.qt.qtgui.util import PintValidator from taurus.qt.qtgui.display import TaurusLabel from taurus.qt.qtgui.container import TaurusWidget -from taurus.core.util.enumeration import Enumeration __all__ = ["TaurusValuesTable"] @@ -982,7 +981,6 @@ def taurusTableMain(): from taurus.qt.qtgui.application import TaurusApplication from taurus.core.util import argparse import sys - import os parser = argparse.get_taurus_parser() parser.set_usage("%prog [options] [model]]") diff --git a/lib/taurus/qt/qtgui/taurusgui/PermanentCustomPanelsDlg.py b/lib/taurus/qt/qtgui/taurusgui/PermanentCustomPanelsDlg.py index 244a1667..539c92f7 100644 --- a/lib/taurus/qt/qtgui/taurusgui/PermanentCustomPanelsDlg.py +++ b/lib/taurus/qt/qtgui/taurusgui/PermanentCustomPanelsDlg.py @@ -28,8 +28,6 @@ PermanentCustomPanelDlg.py: """ -from taurus.external.qt import Qt - class PermanentCustomPanelsDlg(object): """ diff --git a/lib/taurus/qt/qtgui/taurusgui/__init__.py b/lib/taurus/qt/qtgui/taurusgui/__init__.py index c448d97d..5b75f362 100644 --- a/lib/taurus/qt/qtgui/taurusgui/__init__.py +++ b/lib/taurus/qt/qtgui/taurusgui/__init__.py @@ -49,14 +49,14 @@ configuration options (in case of conflict, the options set in `config.py` prevail). """ -from .paneldescriptionwizard import * # noqa: F403 -from .taurusgui import * # noqa: F403 -from .appsettingswizard import * # noqa: F403 +from .paneldescriptionwizard import * # noqa: F403,F401 +from .taurusgui import * # noqa: F403,F401 +from .appsettingswizard import * # noqa: F403,F401 try: # this import is left here for bck-compat, but will be removed # TODO: remove this - from sardana.taurus.qt.qtgui.macrolistener import ( + from sardana.taurus.qt.qtgui.macrolistener import ( # noqa: 401 MacroBroker, DynamicPlotManager, ) diff --git a/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_example01/__init__.py b/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_example01/__init__.py index d4eba0cc..06b7f69f 100644 --- a/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_example01/__init__.py +++ b/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_example01/__init__.py @@ -23,4 +23,4 @@ # # ########################################################################### -from .config import * # noqa: F403 +from .config import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_example01/config.py b/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_example01/config.py index 05454c93..31ea0e9c 100644 --- a/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_example01/config.py +++ b/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_example01/config.py @@ -35,7 +35,7 @@ user will find when launching the GUI for the first time. # ============================================================================= # Import section. You probably want to keep this line. Don't edit this block # unless you know what you are doing -from taurus.qt.qtgui.taurusgui.utils import ( +from taurus.qt.qtgui.taurusgui.utils import ( # noqa: F401 PanelDescription, ExternalApp, ToolBarDescription, diff --git a/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_macrogui/__init__.py b/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_macrogui/__init__.py index d4eba0cc..06b7f69f 100644 --- a/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_macrogui/__init__.py +++ b/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_macrogui/__init__.py @@ -23,4 +23,4 @@ # # ########################################################################### -from .config import * # noqa: F403 +from .config import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_macrogui/config.py b/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_macrogui/config.py index a6b2956c..4579d03f 100644 --- a/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_macrogui/config.py +++ b/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_macrogui/config.py @@ -35,7 +35,7 @@ user will find when launching the GUI for the first time. # ============================================================================= # Import section. You probably want to keep this line. Don't edit this block # unless you know what you are doing -from taurus.qt.qtgui.taurusgui.utils import ( +from taurus.qt.qtgui.taurusgui.utils import ( # noqa: F401 PanelDescription, ExternalApp, Qt_Qt, diff --git a/lib/taurus/qt/qtgui/taurusgui/paneldescriptionwizard.py b/lib/taurus/qt/qtgui/taurusgui/paneldescriptionwizard.py index fbb6dca7..ebe2bf05 100644 --- a/lib/taurus/qt/qtgui/taurusgui/paneldescriptionwizard.py +++ b/lib/taurus/qt/qtgui/taurusgui/paneldescriptionwizard.py @@ -705,7 +705,7 @@ def main(): app = TaurusApplication(sys.argv, cmd_line_parser=None) from taurus.qt.qtgui.container import TaurusMainWindow - form = Qt.QMainWindow() + form = TaurusMainWindow() def kk(d): print(d) diff --git a/lib/taurus/qt/qtgui/test/__init__.py b/lib/taurus/qt/qtgui/test/__init__.py index c32cd24c..de89f99d 100644 --- a/lib/taurus/qt/qtgui/test/__init__.py +++ b/lib/taurus/qt/qtgui/test/__init__.py @@ -23,4 +23,4 @@ # # ########################################################################### -from .base import BaseWidgetTestCase, GenericWidgetTestCase +from .base import BaseWidgetTestCase, GenericWidgetTestCase # noqa: F401 diff --git a/lib/taurus/qt/qtgui/test/test_widgets_general.py b/lib/taurus/qt/qtgui/test/test_widgets_general.py index a4b67e17..446bfd9c 100644 --- a/lib/taurus/qt/qtgui/test/test_widgets_general.py +++ b/lib/taurus/qt/qtgui/test/test_widgets_general.py @@ -34,7 +34,7 @@ from taurus.test.pytest import check_taurus_deprecations try: # The following are Tango-centric imports. - from taurus.core.tango.test import nodb_dev # pytest fixture + from taurus.core.tango.test import nodb_dev # noqa: F401 _TANGO_MISSING = False except Exception: diff --git a/lib/taurus/qt/qtgui/tree/__init__.py b/lib/taurus/qt/qtgui/tree/__init__.py index 7bc15635..71248907 100644 --- a/lib/taurus/qt/qtgui/tree/__init__.py +++ b/lib/taurus/qt/qtgui/tree/__init__.py @@ -28,6 +28,6 @@ __docformat__ = "restructuredtext" -from .qtree import * # noqa: F403 -from .taurustree import * # noqa: F403 -from .taurusdbtree import * # noqa: F403 +from .qtree import * # noqa: F403,F401 +from .taurustree import * # noqa: F403,F401 +from .taurusdbtree import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/tree/taurusdbtree.py b/lib/taurus/qt/qtgui/tree/taurusdbtree.py index 9c75b8a2..0e1058e6 100644 --- a/lib/taurus/qt/qtgui/tree/taurusdbtree.py +++ b/lib/taurus/qt/qtgui/tree/taurusdbtree.py @@ -31,7 +31,7 @@ from taurus.external.qt import Qt from taurus.core.taurusbasetypes import TaurusElementType from taurus.core.taurusauthority import TaurusAuthority -from taurus.qt.qtcore.model import * # noqa: F403 +from taurus.qt.qtcore.model import * # noqa: F403,F401 from taurus.qt.qtgui.base import TaurusBaseWidget from taurus.qt.qtgui.icon import getElementTypeIcon, getElementTypeIconName from .taurustree import TaurusBaseTreeWidget diff --git a/lib/taurus/qt/qtgui/util/__init__.py b/lib/taurus/qt/qtgui/util/__init__.py index ef147a46..dec91b3c 100644 --- a/lib/taurus/qt/qtgui/util/__init__.py +++ b/lib/taurus/qt/qtgui/util/__init__.py @@ -29,11 +29,11 @@ configuration, actions. __docformat__ = "restructuredtext" -from .taurusactionfactory import * # noqa: F403 -from .taurusaction import * # noqa: F403 -from .tauruscolor import * # noqa: F403 -from .tauruswidgetfactory import * # noqa: F403 -from .taurusscreenshot import * # noqa: F403 -from .qdraganddropdebug import * # noqa: F403 -from .ui import * # noqa: F403 -from .validator import * # noqa: F403 +from .taurusactionfactory import * # noqa: F403,F401 +from .taurusaction import * # noqa: F403,F401 +from .tauruscolor import * # noqa: F403,F401 +from .tauruswidgetfactory import * # noqa: F403,F401 +from .taurusscreenshot import * # noqa: F403,F401 +from .qdraganddropdebug import * # noqa: F403,F401 +from .ui import * # noqa: F403,F401 +from .validator import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/util/taurusscreenshot.py b/lib/taurus/qt/qtgui/util/taurusscreenshot.py index 91dd6fcd..e4239cdd 100644 --- a/lib/taurus/qt/qtgui/util/taurusscreenshot.py +++ b/lib/taurus/qt/qtgui/util/taurusscreenshot.py @@ -32,7 +32,6 @@ __docformat__ = "restructuredtext" import time import threading -import os.path from taurus.external.qt import Qt from taurus.core.util.log import Logger diff --git a/lib/taurus/qt/qtgui/util/test/test_ui/__init__.py b/lib/taurus/qt/qtgui/util/test/test_ui/__init__.py index f0adb4b0..f4facf03 100644 --- a/lib/taurus/qt/qtgui/util/test/test_ui/__init__.py +++ b/lib/taurus/qt/qtgui/util/test/test_ui/__init__.py @@ -27,4 +27,4 @@ configuration, actions. """ -from .test_ui import * # noqa: F403 +from .test_ui import * # noqa: F403,F401 diff --git a/lib/taurus/qt/qtgui/util/validator.py b/lib/taurus/qt/qtgui/util/validator.py index 4e14adc3..21245107 100644 --- a/lib/taurus/qt/qtgui/util/validator.py +++ b/lib/taurus/qt/qtgui/util/validator.py @@ -24,7 +24,7 @@ __all__ = ["PintValidator"] from taurus.external.qt import Qt -from taurus.core.units import Quantity, UR +from taurus.core.units import Quantity from pint import DimensionalityError diff --git a/lib/taurus/test/__init__.py b/lib/taurus/test/__init__.py index d3a24b1e..2311a2ee 100644 --- a/lib/taurus/test/__init__.py +++ b/lib/taurus/test/__init__.py @@ -53,7 +53,11 @@ The following are some key points to keep in mind when using this framework: subdirectories named `res` """ -from .moduleexplorer import ModuleExplorer -from .resource import getResourcePath -from .base import insertTest -from .fuzzytest import calculateTestFuzziness, loopSubprocess, loopTest +from .moduleexplorer import ModuleExplorer # noqa: F401 +from .resource import getResourcePath # noqa: F401 +from .base import insertTest # noqa: F401 +from .fuzzytest import ( # noqa: F401 + calculateTestFuzziness, + loopSubprocess, + loopTest, +) diff --git a/lib/taurus/test/test_import.py b/lib/taurus/test/test_import.py index 823421a2..84faaa17 100644 --- a/lib/taurus/test/test_import.py +++ b/lib/taurus/test/test_import.py @@ -26,7 +26,6 @@ """Taurus import tests """ -import sys import unittest @@ -56,11 +55,11 @@ class TaurusImportTestCase(unittest.TestCase): ] try: - import PyTango + import PyTango # noqa: F401 except ImportError: exclude_patterns.append(r"taurus\.core\.tango") try: - import epics + import epics # noqa: F401 except ImportError: exclude_patterns.append(r"taurus\.core\.epics") @@ -23,7 +23,7 @@ # # ########################################################################### -import sys + from setuptools import setup, find_packages |