From b2122d5104bcadf9bcc08c2ee3aa52d82f1d891f Mon Sep 17 00:00:00 2001 From: Winnie Date: Mon, 1 Aug 2022 22:50:40 +0200 Subject: [PATCH] Remove or ignore unused imports (F401) (#2081) * Remove unused imports (F401) * Ignore unused imports in exportimport.instruments * Remove unused imports from browser.viewlets.toolbar * Remove unused imports from browser.form.adapters.sampletype * Remove unused imports from browser.fields.record * Ignore unused imports in behaviors * Remove unused imports from exportimport.dataimport * Remove unused imports from exportimport.instruments * Remove unused imports from numbergenerator * Remove unused imports from jsonapi * Ignore unused imports in skins.bika.guard_handler * Remove unused imports from content.referencesample * Remove unused imports from content.worksheetfolder * Remove unused imports from content.bikasetup * Remove unused imports from content.instrumenttype * Remove unused imports from content.duplicateanalysis * Remove unused imports from content.referencedefinition * Remove unused imports from content.manufacturer * Remove unused imports from content.report * Remove unused imports from browser.analysisprofile * Ignore unused imports in browser.worksheet.views * Remove unused imports in browser.department.ajax * Remove unused imports in browser.viewlets.analysisrequest * Ignore unused imports in browser.analyses * Remove unused imports in browser.analyses.view * Ignore unused imports in browser.client * Ignore unused imports in browser.widgets * Remove unused imports in browser.widgets.rejectionwidget * Ignore unused imports in browser.analysisrequest.analysisrequests * Ignore unused imports in browser.analysisrequest * Remove unused imports in browser.reports * Remove unused imports in lims.api.analysis * Remove unused imports in lims.monkey.Widget * Ignore unused imports in subscribers * Ignore unused imports in interfaces * Enable E712 in flake8 --- src/bika/lims/api/analysis.py | 1 - src/bika/lims/browser/analyses/view.py | 1 - src/bika/lims/browser/analysisprofile.py | 1 - .../lims/browser/analysisrequest/__init__.py | 6 +++--- src/bika/lims/browser/department/ajax.py | 1 - .../productivity_analysesperformedpertotal.py | 1 - .../browser/reports/selection_macros/__init__.py | 1 - .../lims/browser/viewlets/analysisrequest.py | 1 - src/bika/lims/browser/widgets/rejectionwidget.py | 5 +---- src/bika/lims/browser/worksheet/tools.py | 4 ++-- src/bika/lims/content/bikasetup.py | 1 - src/bika/lims/content/duplicateanalysis.py | 1 - src/bika/lims/content/instrumenttype.py | 3 --- src/bika/lims/content/manufacturer.py | 3 --- src/bika/lims/content/referencedefinition.py | 6 +----- src/bika/lims/content/referencesample.py | 3 --- src/bika/lims/content/report.py | 3 --- src/bika/lims/content/worksheetfolder.py | 4 ---- src/bika/lims/jsonapi/getusers.py | 4 +--- src/bika/lims/jsonapi/read.py | 2 +- src/bika/lims/jsonapi/remove.py | 2 -- src/bika/lims/monkey/Widget.py | 1 - src/bika/lims/numbergenerator.py | 2 -- src/senaite/core/browser/fields/record.py | 5 ----- .../core/browser/form/adapters/sampletype.py | 2 -- src/senaite/core/exportimport/dataimport.py | 3 --- .../instruments/alere/pima/__init__.py | 3 --- .../instruments/biodrop/ulite/__init__.py | 3 --- .../instruments/eltra/cs/__init__.py | 1 - .../instruments/facscalibur/calibur/__init__.py | 1 - .../facscalibur/calibur/model_e9750.py | 1 - .../instruments/foss/winescan/__init__.py | 2 -- .../lifetechnologies/qubit/__init__.py | 2 -- .../instruments/panalytical/omnia/__init__.py | 1 - .../instruments/sealanalytical/aq2/__init__.py | 1 - .../instruments/tescan/tima/__init__.py | 2 -- .../exportimport/instruments/tescan/tima/tima.py | 2 -- .../thermoscientific/gallery/__init__.py | 3 +-- .../thermoscientific/multiskan/__init__.py | 1 - travis_ci_flake8.cfg | 16 ++++++++++++---- 40 files changed, 22 insertions(+), 84 deletions(-) diff --git a/src/bika/lims/api/analysis.py b/src/bika/lims/api/analysis.py index be941d4362..3cb41d9912 100644 --- a/src/bika/lims/api/analysis.py +++ b/src/bika/lims/api/analysis.py @@ -28,7 +28,6 @@ from zope.component._api import getAdapters from bika.lims.interfaces import IDuplicateAnalysis -from bika.lims.interfaces import ISubmitted from bika.lims.interfaces.analysis import IRequestAnalysis diff --git a/src/bika/lims/browser/analyses/view.py b/src/bika/lims/browser/analyses/view.py index 816cd8dc73..1aa4f832a4 100644 --- a/src/bika/lims/browser/analyses/view.py +++ b/src/bika/lims/browser/analyses/view.py @@ -50,7 +50,6 @@ from bika.lims.utils import get_image from bika.lims.utils import get_link from bika.lims.utils import get_link_for -from bika.lims.utils import getUsers from bika.lims.utils import t from bika.lims.utils.analysis import format_uncertainty from DateTime import DateTime diff --git a/src/bika/lims/browser/analysisprofile.py b/src/bika/lims/browser/analysisprofile.py index 970b8550ba..1a0de4c3ae 100644 --- a/src/bika/lims/browser/analysisprofile.py +++ b/src/bika/lims/browser/analysisprofile.py @@ -18,7 +18,6 @@ # Copyright 2018-2021 by it's authors. # Some rights reserved, see README and LICENSE. -from bika.lims.jsonapi import load_field_values from bika.lims.interfaces import IJSONReadExtender, IAnalysisProfile from zope.component import adapts from zope.interface import implements diff --git a/src/bika/lims/browser/analysisrequest/__init__.py b/src/bika/lims/browser/analysisrequest/__init__.py index 22f229b666..f1f6606f0c 100644 --- a/src/bika/lims/browser/analysisrequest/__init__.py +++ b/src/bika/lims/browser/analysisrequest/__init__.py @@ -34,9 +34,9 @@ # this comment twice. from .view import AnalysisRequestViewView -from .add2 import AnalysisRequestAddView # noqa: F401 -from .add2 import AnalysisRequestManageView # noqa: F401 -from .add2 import ajaxAnalysisRequestAddView # noqa: F401 +from .add2 import AnalysisRequestAddView +from .add2 import AnalysisRequestManageView +from .add2 import ajaxAnalysisRequestAddView from .analysisrequests import AnalysisRequestsView from .invoice import InvoicePrintView from .invoice import InvoiceView diff --git a/src/bika/lims/browser/department/ajax.py b/src/bika/lims/browser/department/ajax.py index 6fac8640f7..a85b93d007 100644 --- a/src/bika/lims/browser/department/ajax.py +++ b/src/bika/lims/browser/department/ajax.py @@ -20,7 +20,6 @@ from Products.CMFCore.utils import getToolByName from bika.lims.browser import BrowserView -import plone import json diff --git a/src/bika/lims/browser/reports/productivity_analysesperformedpertotal.py b/src/bika/lims/browser/reports/productivity_analysesperformedpertotal.py index d2a21f2a22..dcd007f308 100644 --- a/src/bika/lims/browser/reports/productivity_analysesperformedpertotal.py +++ b/src/bika/lims/browser/reports/productivity_analysesperformedpertotal.py @@ -24,7 +24,6 @@ from bika.lims.browser import BrowserView from bika.lims.browser.reports.selection_macros import SelectionMacrosView from plone.app.layout.globals.interfaces import IViewView -from six import StringIO from zope.interface import implements diff --git a/src/bika/lims/browser/reports/selection_macros/__init__.py b/src/bika/lims/browser/reports/selection_macros/__init__.py index 7d29ba92ec..5307cb141a 100644 --- a/src/bika/lims/browser/reports/selection_macros/__init__.py +++ b/src/bika/lims/browser/reports/selection_macros/__init__.py @@ -24,7 +24,6 @@ from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile from bika.lims.utils import getUsers from bika.lims import bikaMessageFactory as _ -from bika.lims import PMF from plone.memoize import ram from time import time diff --git a/src/bika/lims/browser/viewlets/analysisrequest.py b/src/bika/lims/browser/viewlets/analysisrequest.py index fa5896da02..ebdef6e5f5 100644 --- a/src/bika/lims/browser/viewlets/analysisrequest.py +++ b/src/bika/lims/browser/viewlets/analysisrequest.py @@ -23,7 +23,6 @@ from bika.lims import FieldEditSpecification from bika.lims import api -from bika.lims import logger from bika.lims.api.analysis import is_result_range_compliant from bika.lims.api.security import check_permission diff --git a/src/bika/lims/browser/widgets/rejectionwidget.py b/src/bika/lims/browser/widgets/rejectionwidget.py index 130bc47f81..b7ff783fc8 100644 --- a/src/bika/lims/browser/widgets/rejectionwidget.py +++ b/src/bika/lims/browser/widgets/rejectionwidget.py @@ -21,10 +21,7 @@ from AccessControl import ClassSecurityInfo from Products.Archetypes.Registry import registerWidget from Products.Archetypes.Widget import TypesWidget -from Products.Archetypes.interfaces import IVocabulary -from zope.interface import implements -from zope.schema.vocabulary import SimpleVocabulary -from zope.schema.vocabulary import SimpleTerm + try: from zope.component.hooks import getSite except: diff --git a/src/bika/lims/browser/worksheet/tools.py b/src/bika/lims/browser/worksheet/tools.py index 1b98ba9404..a3edbd77c2 100644 --- a/src/bika/lims/browser/worksheet/tools.py +++ b/src/bika/lims/browser/worksheet/tools.py @@ -38,7 +38,7 @@ def checkUserAccess(worksheet, request, redirect=True): """ # Deny access to foreign analysts allowed = worksheet.checkUserAccess() - if allowed == False and redirect == True: + if not allowed and redirect: msg = _('You do not have sufficient privileges to view ' 'the worksheet ${worksheet_title}.', mapping={"worksheet_title": worksheet.Title()}) @@ -57,7 +57,7 @@ def checkUserManage(worksheet, request, redirect=True): /manage_results view. Otherwise, does nothing """ allowed = worksheet.checkUserManage() - if allowed == False and redirect == True: + if not allowed and redirect: # Redirect to /manage_results view destination_url = worksheet.absolute_url() + "/manage_results" request.response.redirect(destination_url) diff --git a/src/bika/lims/content/bikasetup.py b/src/bika/lims/content/bikasetup.py index ab45db1526..65803138f3 100644 --- a/src/bika/lims/content/bikasetup.py +++ b/src/bika/lims/content/bikasetup.py @@ -58,7 +58,6 @@ from Products.Archetypes.utils import IntDisplayList from Products.Archetypes.Widget import RichWidget from Products.CMFCore.utils import getToolByName -from senaite.core import registry as senaite_registry from senaite.core.api import geo from senaite.core.browser.fields.records import RecordsField from senaite.core.interfaces import IHideActionsMenu diff --git a/src/bika/lims/content/duplicateanalysis.py b/src/bika/lims/content/duplicateanalysis.py index d8c7f51247..0d7b3b6fc1 100644 --- a/src/bika/lims/content/duplicateanalysis.py +++ b/src/bika/lims/content/duplicateanalysis.py @@ -28,7 +28,6 @@ from bika.lims.content.abstractroutineanalysis import schema from bika.lims.content.analysisspec import ResultsRangeDict from bika.lims.interfaces import IDuplicateAnalysis -from bika.lims.interfaces import ISubmitted from bika.lims.interfaces.analysis import IRequestAnalysis from bika.lims import logger from bika.lims.workflow import in_state diff --git a/src/bika/lims/content/instrumenttype.py b/src/bika/lims/content/instrumenttype.py index e3ef09267b..5a0460657a 100644 --- a/src/bika/lims/content/instrumenttype.py +++ b/src/bika/lims/content/instrumenttype.py @@ -20,9 +20,6 @@ from AccessControl import ClassSecurityInfo from Products.Archetypes.public import * -from Products.CMFCore.permissions import View, ModifyPortalContent -from bika.lims import bikaMessageFactory as _ -from bika.lims.utils import t from bika.lims.config import PROJECTNAME from bika.lims.content.bikaschema import BikaSchema from bika.lims.interfaces import IInstrumentType, IDeactivable diff --git a/src/bika/lims/content/manufacturer.py b/src/bika/lims/content/manufacturer.py index 37a9c0b119..8cff088538 100644 --- a/src/bika/lims/content/manufacturer.py +++ b/src/bika/lims/content/manufacturer.py @@ -20,9 +20,6 @@ from AccessControl import ClassSecurityInfo from Products.Archetypes.public import * -from Products.CMFCore.permissions import View, ModifyPortalContent -from bika.lims import bikaMessageFactory as _ -from bika.lims.utils import t from bika.lims.config import PROJECTNAME from bika.lims.content.bikaschema import BikaSchema from bika.lims.interfaces import IManufacturer, IDeactivable diff --git a/src/bika/lims/content/referencedefinition.py b/src/bika/lims/content/referencedefinition.py index ef8201442e..f6a30c0929 100644 --- a/src/bika/lims/content/referencedefinition.py +++ b/src/bika/lims/content/referencedefinition.py @@ -22,16 +22,12 @@ reference samples used in quality control """ from AccessControl import ClassSecurityInfo -from DateTime import DateTime from Products.Archetypes.public import * -from Products.CMFCore.permissions import View, ModifyPortalContent from bika.lims.content.bikaschema import BikaSchema from bika.lims.browser.fields import ReferenceResultsField from bika.lims.browser.widgets import ReferenceResultsWidget from bika.lims.config import PROJECTNAME -import sys -import time -from bika.lims import PMF, bikaMessageFactory as _ +from bika.lims import bikaMessageFactory as _ from bika.lims.interfaces import IDeactivable from zope.interface import implements diff --git a/src/bika/lims/content/referencesample.py b/src/bika/lims/content/referencesample.py index fa4e0af7d5..5e1ce32958 100644 --- a/src/bika/lims/content/referencesample.py +++ b/src/bika/lims/content/referencesample.py @@ -21,9 +21,6 @@ """ReferenceSample represents a reference sample used for quality control testing """ -import sys -import time - from AccessControl import ClassSecurityInfo from bika.lims import api from bika.lims import bikaMessageFactory as _ diff --git a/src/bika/lims/content/report.py b/src/bika/lims/content/report.py index 4a169d4bcb..6b34b2c6be 100644 --- a/src/bika/lims/content/report.py +++ b/src/bika/lims/content/report.py @@ -23,13 +23,10 @@ from DateTime import DateTime from Products.Archetypes.public import * from plone.app.blob.field import FileField as BlobFileField -from Products.CMFCore.utils import getToolByName from bika.lims.content.bikaschema import BikaSchema from bika.lims.config import PROJECTNAME from bika.lims import bikaMessageFactory as _ from bika.lims.content.clientawaremixin import ClientAwareMixin -from bika.lims.utils import t -from bika.lims.browser import ulocalized_time from bika.lims.utils import user_fullname schema = BikaSchema.copy() + Schema(( diff --git a/src/bika/lims/content/worksheetfolder.py b/src/bika/lims/content/worksheetfolder.py index 5d4bc43667..b458128579 100644 --- a/src/bika/lims/content/worksheetfolder.py +++ b/src/bika/lims/content/worksheetfolder.py @@ -22,15 +22,11 @@ """ from Products.ATContentTypes.content import schemata from Products.Archetypes import atapi -from Products.CMFCore import permissions -from Products.CMFCore.utils import getToolByName from bika.lims.config import PROJECTNAME from bika.lims.interfaces import IWorksheetFolder from plone.app.folder import folder from AccessControl import ClassSecurityInfo from zope.interface import implements -from bika.lims import bikaMessageFactory as _ -from bika.lims.utils import t schema = folder.ATFolderSchema.copy() schema['id'].widget.visible = {'edit':'hidden', 'view': 'invisible'} diff --git a/src/bika/lims/jsonapi/getusers.py b/src/bika/lims/jsonapi/getusers.py index 9c8ec573bf..b3f9fc7c06 100644 --- a/src/bika/lims/jsonapi/getusers.py +++ b/src/bika/lims/jsonapi/getusers.py @@ -18,14 +18,12 @@ # Copyright 2018-2021 by it's authors. # Some rights reserved, see README and LICENSE. -from bika.lims.utils import getUsers from plone.jsonapi.core import router from plone.jsonapi.core.interfaces import IRouteProvider from Products.CMFCore.utils import getToolByName from zExceptions import BadRequest from zope import interface -import json -import transaction + class getUsers(object): interface.implements(IRouteProvider) diff --git a/src/bika/lims/jsonapi/read.py b/src/bika/lims/jsonapi/read.py index 579ebd7874..b480cd8516 100644 --- a/src/bika/lims/jsonapi/read.py +++ b/src/bika/lims/jsonapi/read.py @@ -19,7 +19,7 @@ # Some rights reserved, see README and LICENSE. from Products.CMFPlone.utils import safe_unicode -from bika.lims import logger, to_utf8 +from bika.lims import logger from bika.lims.interfaces import IJSONReadExtender from bika.lims.jsonapi import get_include_fields from plone.jsonapi.core import router diff --git a/src/bika/lims/jsonapi/remove.py b/src/bika/lims/jsonapi/remove.py index d2eb58ead9..d9f6d7a0c3 100644 --- a/src/bika/lims/jsonapi/remove.py +++ b/src/bika/lims/jsonapi/remove.py @@ -18,13 +18,11 @@ # Copyright 2018-2021 by it's authors. # Some rights reserved, see README and LICENSE. -from bika.lims.jsonapi.read import read from plone.jsonapi.core import router from plone.jsonapi.core.interfaces import IRouteProvider from Products.CMFCore.utils import getToolByName from zExceptions import BadRequest from zope import interface -import json import transaction diff --git a/src/bika/lims/monkey/Widget.py b/src/bika/lims/monkey/Widget.py index 59b008955b..000ac361d7 100644 --- a/src/bika/lims/monkey/Widget.py +++ b/src/bika/lims/monkey/Widget.py @@ -22,7 +22,6 @@ from bika.lims import logger from bika.lims.interfaces import IATWidgetVisibility from types import DictType -from plone import api from Acquisition import aq_base from zope.component import getAdapters diff --git a/src/bika/lims/numbergenerator.py b/src/bika/lims/numbergenerator.py index 95d1ec514a..cef2376799 100644 --- a/src/bika/lims/numbergenerator.py +++ b/src/bika/lims/numbergenerator.py @@ -20,12 +20,10 @@ import thread import logging -import datetime from bika.lims.interfaces import INumberGenerator from BTrees.OIBTree import OIBTree from plone import api from zope.annotation.interfaces import IAnnotations -from zope.component import getGlobalSiteManager from zope.interface import implements diff --git a/src/senaite/core/browser/fields/record.py b/src/senaite/core/browser/fields/record.py index d4be96663d..62575d9b82 100644 --- a/src/senaite/core/browser/fields/record.py +++ b/src/senaite/core/browser/fields/record.py @@ -18,15 +18,11 @@ # Copyright 2018-2021 by it's authors. # Some rights reserved, see README and LICENSE. -from types import ClassType from types import DictType -from types import FileType -from types import IntType from types import ListType from types import StringType from types import StringTypes from types import TupleType -from types import UnicodeType from AccessControl import ClassSecurityInfo from App.class_init import InitializeClass @@ -42,7 +38,6 @@ from Products.CMFCore.Expression import createExprContext from Products.CMFCore.utils import getToolByName from Products.PythonScripts.standard import html_quote -from senaite.core.browser.fields.utils import getDisplayList from senaite.core.browser.widgets.recordwidget import RecordWidget # we have to define our own validation handling diff --git a/src/senaite/core/browser/form/adapters/sampletype.py b/src/senaite/core/browser/form/adapters/sampletype.py index f20996666b..b8d6a48d82 100644 --- a/src/senaite/core/browser/form/adapters/sampletype.py +++ b/src/senaite/core/browser/form/adapters/sampletype.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- -from bika.lims import api -from bika.lims import senaiteMessageFactory as _ from senaite.core.browser.form.adapters import EditFormAdapterBase from bika.lims.vocabularies import getStickerTemplates diff --git a/src/senaite/core/exportimport/dataimport.py b/src/senaite/core/exportimport/dataimport.py index b698d14caf..601f4182e6 100644 --- a/src/senaite/core/exportimport/dataimport.py +++ b/src/senaite/core/exportimport/dataimport.py @@ -19,12 +19,9 @@ # Some rights reserved, see README and LICENSE. import json -import os.path -from pkg_resources import resource_filename from pkg_resources import resource_listdir -import plone from bika.lims.browser import BrowserView from bika.lims.interfaces import ISetupDataSetList from plone.app.layout.globals.interfaces import IViewView diff --git a/src/senaite/core/exportimport/instruments/alere/pima/__init__.py b/src/senaite/core/exportimport/instruments/alere/pima/__init__.py index c33eeeecd4..e6a4237e5d 100644 --- a/src/senaite/core/exportimport/instruments/alere/pima/__init__.py +++ b/src/senaite/core/exportimport/instruments/alere/pima/__init__.py @@ -20,9 +20,6 @@ """ Alere Pima """ -from datetime import datetime -from bika.lims.utils import to_unicode -from bika.lims import bikaMessageFactory as _ from senaite.core.exportimport.instruments.resultsimport import \ AnalysisResultsImporter, InstrumentCSVResultsFileParser diff --git a/src/senaite/core/exportimport/instruments/biodrop/ulite/__init__.py b/src/senaite/core/exportimport/instruments/biodrop/ulite/__init__.py index e658e88109..b06c8e47ba 100644 --- a/src/senaite/core/exportimport/instruments/biodrop/ulite/__init__.py +++ b/src/senaite/core/exportimport/instruments/biodrop/ulite/__init__.py @@ -20,11 +20,8 @@ """ Biodrop """ -from bika.lims import bikaMessageFactory as _ -from bika.lims.utils import t from senaite.core.exportimport.instruments.resultsimport import \ InstrumentCSVResultsFileParser, AnalysisResultsImporter -from datetime import datetime class BioDropCSVParser(InstrumentCSVResultsFileParser): """ diff --git a/src/senaite/core/exportimport/instruments/eltra/cs/__init__.py b/src/senaite/core/exportimport/instruments/eltra/cs/__init__.py index 0d416db50a..a72dd37337 100644 --- a/src/senaite/core/exportimport/instruments/eltra/cs/__init__.py +++ b/src/senaite/core/exportimport/instruments/eltra/cs/__init__.py @@ -23,7 +23,6 @@ from datetime import datetime from senaite.core.exportimport.instruments.resultsimport import \ AnalysisResultsImporter, InstrumentCSVResultsFileParser -from bika.lims import bikaMessageFactory as _ class EltraCSTSVParser(InstrumentCSVResultsFileParser): diff --git a/src/senaite/core/exportimport/instruments/facscalibur/calibur/__init__.py b/src/senaite/core/exportimport/instruments/facscalibur/calibur/__init__.py index f16f72daab..b2d89ca017 100644 --- a/src/senaite/core/exportimport/instruments/facscalibur/calibur/__init__.py +++ b/src/senaite/core/exportimport/instruments/facscalibur/calibur/__init__.py @@ -20,7 +20,6 @@ """ Facs Calibur """ -from datetime import datetime from senaite.core.exportimport.instruments.resultsimport import \ AnalysisResultsImporter, InstrumentCSVResultsFileParser diff --git a/src/senaite/core/exportimport/instruments/facscalibur/calibur/model_e9750.py b/src/senaite/core/exportimport/instruments/facscalibur/calibur/model_e9750.py index c043f23d96..4c07cc4c13 100644 --- a/src/senaite/core/exportimport/instruments/facscalibur/calibur/model_e9750.py +++ b/src/senaite/core/exportimport/instruments/facscalibur/calibur/model_e9750.py @@ -26,7 +26,6 @@ from . import FacsCaliburCSVParser, FacsCaliburImporter import json import traceback -import logging title = "FACS Calibur" diff --git a/src/senaite/core/exportimport/instruments/foss/winescan/__init__.py b/src/senaite/core/exportimport/instruments/foss/winescan/__init__.py index e2f65f3b00..c833ddecd3 100644 --- a/src/senaite/core/exportimport/instruments/foss/winescan/__init__.py +++ b/src/senaite/core/exportimport/instruments/foss/winescan/__init__.py @@ -20,8 +20,6 @@ """ FOSS 'Winescan' """ -from bika.lims import bikaMessageFactory as _ -from bika.lims.utils import t from senaite.core.exportimport.instruments.resultsimport import \ InstrumentCSVResultsFileParser, AnalysisResultsImporter diff --git a/src/senaite/core/exportimport/instruments/lifetechnologies/qubit/__init__.py b/src/senaite/core/exportimport/instruments/lifetechnologies/qubit/__init__.py index 9a070c9e93..de8ff7e6d5 100644 --- a/src/senaite/core/exportimport/instruments/lifetechnologies/qubit/__init__.py +++ b/src/senaite/core/exportimport/instruments/lifetechnologies/qubit/__init__.py @@ -21,8 +21,6 @@ """ Life Technologies QuBit """ from datetime import datetime -from bika.lims.utils import to_unicode -from bika.lims import bikaMessageFactory as _ from senaite.core.exportimport.instruments.resultsimport import \ AnalysisResultsImporter, InstrumentCSVResultsFileParser diff --git a/src/senaite/core/exportimport/instruments/panalytical/omnia/__init__.py b/src/senaite/core/exportimport/instruments/panalytical/omnia/__init__.py index 99831bbc5d..86c548d964 100644 --- a/src/senaite/core/exportimport/instruments/panalytical/omnia/__init__.py +++ b/src/senaite/core/exportimport/instruments/panalytical/omnia/__init__.py @@ -22,7 +22,6 @@ """ from datetime import datetime from bika.lims.utils import to_unicode -from bika.lims import bikaMessageFactory as _ from senaite.core.exportimport.instruments.resultsimport import \ AnalysisResultsImporter, InstrumentCSVResultsFileParser diff --git a/src/senaite/core/exportimport/instruments/sealanalytical/aq2/__init__.py b/src/senaite/core/exportimport/instruments/sealanalytical/aq2/__init__.py index fdca5b05ef..ed13d473ed 100644 --- a/src/senaite/core/exportimport/instruments/sealanalytical/aq2/__init__.py +++ b/src/senaite/core/exportimport/instruments/sealanalytical/aq2/__init__.py @@ -20,7 +20,6 @@ """ Seal Analytics AQ2 """ -from datetime import datetime from senaite.core.exportimport.instruments.resultsimport import \ AnalysisResultsImporter, InstrumentCSVResultsFileParser diff --git a/src/senaite/core/exportimport/instruments/tescan/tima/__init__.py b/src/senaite/core/exportimport/instruments/tescan/tima/__init__.py index e34c2cb7f1..606586ff0c 100644 --- a/src/senaite/core/exportimport/instruments/tescan/tima/__init__.py +++ b/src/senaite/core/exportimport/instruments/tescan/tima/__init__.py @@ -20,8 +20,6 @@ """ Tescan TIMA """ -from bika.lims import bikaMessageFactory as _ -from bika.lims.utils import t from senaite.core.exportimport.instruments.resultsimport import \ InstrumentCSVResultsFileParser, AnalysisResultsImporter from datetime import datetime diff --git a/src/senaite/core/exportimport/instruments/tescan/tima/tima.py b/src/senaite/core/exportimport/instruments/tescan/tima/tima.py index ace48793ba..969c07859c 100644 --- a/src/senaite/core/exportimport/instruments/tescan/tima/tima.py +++ b/src/senaite/core/exportimport/instruments/tescan/tima/tima.py @@ -21,8 +21,6 @@ """ TESCAN TIMA """ from . import TimaCSVParser, TimaImporter -from senaite.core.exportimport.instruments.resultsimport import \ - AnalysisResultsImporter import json import traceback diff --git a/src/senaite/core/exportimport/instruments/thermoscientific/gallery/__init__.py b/src/senaite/core/exportimport/instruments/thermoscientific/gallery/__init__.py index feb301e3f0..bdbf5114db 100644 --- a/src/senaite/core/exportimport/instruments/thermoscientific/gallery/__init__.py +++ b/src/senaite/core/exportimport/instruments/thermoscientific/gallery/__init__.py @@ -20,8 +20,7 @@ """ Thermo Scientific 'Gallery' """ -from bika.lims import bikaMessageFactory as _ -from bika.lims.utils import t + from senaite.core.exportimport.instruments.resultsimport import \ AnalysisResultsImporter, InstrumentCSVResultsFileParser diff --git a/src/senaite/core/exportimport/instruments/thermoscientific/multiskan/__init__.py b/src/senaite/core/exportimport/instruments/thermoscientific/multiskan/__init__.py index 5e71d1467a..6a1c037346 100644 --- a/src/senaite/core/exportimport/instruments/thermoscientific/multiskan/__init__.py +++ b/src/senaite/core/exportimport/instruments/thermoscientific/multiskan/__init__.py @@ -20,7 +20,6 @@ """ Thermo Scientific Multiskan GO """ -from datetime import datetime from senaite.core.exportimport.instruments.resultsimport import \ AnalysisResultsImporter, InstrumentCSVResultsFileParser diff --git a/travis_ci_flake8.cfg b/travis_ci_flake8.cfg index 6fc4bd40cc..723bfc481e 100644 --- a/travis_ci_flake8.cfg +++ b/travis_ci_flake8.cfg @@ -85,16 +85,12 @@ ignore = E701, # E703: statement ends with a semicolon E703, - # E712: comparison to False should be 'if cond is False:' or 'if not cond:' - E712, # E713: test for membership should be 'not in' E713, # E721: do not compare types, use 'isinstance()' E721, # E722: do not use bare 'except' E722, - # F401: 'bika.lims.interfaces.ISubmitted' imported but unused - F401, # F403: 'from bika.lims.permissions import *' used; unable to detect undefined names F403, # F405: 'AddAnalysisProfile' may be undefined, or defined from star imports: bika.lims.permissions @@ -133,3 +129,15 @@ ignore = W601, # W605: invalid escape sequence '\d' W605, +per-file-ignores = + src/bika/lims/skins/bika/guard_handler.py:F401, + src/bika/lims/browser/worksheet/views/__init__.py:F401, + src/bika/lims/browser/analyses/__init__.py:F401, + src/bika/lims/browser/client/__init__.py:F401, + src/bika/lims/browser/widgets/__init__.py:F401, + src/bika/lims/browser/analysisrequest/analysisrequests.py:F401, + src/bika/lims/browser/analysisrequest/__init__.py:F401, + src/bika/lims/subscribers/__init__.py:F401, + src/bika/lims/interfaces/__init__.py:F401, + src/senaite/core/exportimport/instruments/__init__.py:F401, + src/senaite/core/behaviors/__init__.py:F401,