diff --git a/src/bika/lims/browser/client/views/attachments.py b/src/bika/lims/browser/client/views/attachments.py index 1f6a90cd34..12b5a1d2c5 100644 --- a/src/bika/lims/browser/client/views/attachments.py +++ b/src/bika/lims/browser/client/views/attachments.py @@ -77,7 +77,6 @@ def folderitem(self, obj, item, index): obj = api.get_object(obj) obj_url = api.get_url(obj) file = obj.getAttachmentFile() - icon = file.icon item['AttachmentFile'] = file.filename() item['AttachmentType'] = obj.getAttachmentType().Title() item['AttachmentType'] = obj.getAttachmentType().Title() diff --git a/src/bika/lims/browser/reports/administration_arsnotinvoiced.py b/src/bika/lims/browser/reports/administration_arsnotinvoiced.py index ab121e91d6..1d1a034486 100644 --- a/src/bika/lims/browser/reports/administration_arsnotinvoiced.py +++ b/src/bika/lims/browser/reports/administration_arsnotinvoiced.py @@ -41,7 +41,6 @@ def __init__(self, context, request, report=None): def __call__(self): bc = getToolByName(self.context, 'senaite_catalog') self.report_content = {} - parm_lines = {} parms = [] headings = {} headings['header'] = _("Samples not invoiced") @@ -86,11 +85,6 @@ def __call__(self): } datalines = [] - clients = {} - sampletypes = {} - samplepoints = {} - categories = {} - services = {} for ar_proxy in bc(query): ar = ar_proxy.getObject() diff --git a/src/bika/lims/browser/reports/productivity_analysespersampletype.py b/src/bika/lims/browser/reports/productivity_analysespersampletype.py index b455dbe70c..e24ae45a63 100644 --- a/src/bika/lims/browser/reports/productivity_analysespersampletype.py +++ b/src/bika/lims/browser/reports/productivity_analysespersampletype.py @@ -44,7 +44,6 @@ def __call__(self): bac = getToolByName(self.context, 'senaite_catalog_analysis') rc = getToolByName(self.context, 'reference_catalog') self.report_content = {} - parm_lines = {} parms = [] headings = {} headings['header'] = _("Analyses per sample type") diff --git a/src/bika/lims/browser/widgets/scheduleinputwidget.py b/src/bika/lims/browser/widgets/scheduleinputwidget.py index 5c09a590e6..873795e9c7 100644 --- a/src/bika/lims/browser/widgets/scheduleinputwidget.py +++ b/src/bika/lims/browser/widgets/scheduleinputwidget.py @@ -37,9 +37,7 @@ class ScheduleInputWidget(TypesWidget): security = ClassSecurityInfo() def process_form(self, instance, field, form, empty_marker=None, emptyReturnsMarker=False): - - values = len(instance.getScheduleCriteria())>0 and instance.getScheduleCriteria() or [] - + if "form.button.save" in form: value = [] fn = form['fieldName'] diff --git a/src/bika/lims/browser/worksheet/views/export.py b/src/bika/lims/browser/worksheet/views/export.py index 1279003b3c..59968435c6 100644 --- a/src/bika/lims/browser/worksheet/views/export.py +++ b/src/bika/lims/browser/worksheet/views/export.py @@ -27,9 +27,6 @@ class ExportView(BrowserView): """ """ def __call__(self): - - translate = self.context.translate - instrument = self.context.getInstrument() if not instrument: self.context.plone_utils.addPortalMessage( @@ -58,5 +55,5 @@ def __call__(self): return exporter = exim.Export(self.context, self.request) - data = exporter(self.context.getAnalyses()) + exporter(self.context.getAnalyses()) pass diff --git a/src/bika/lims/content/instrument.py b/src/bika/lims/content/instrument.py index 324a4a5c04..b734cb8adb 100644 --- a/src/bika/lims/content/instrument.py +++ b/src/bika/lims/content/instrument.py @@ -611,11 +611,7 @@ def addReferences(self, reference, service_uids): """ # TODO Workflow - Analyses. Assignment of refanalysis to Instrument addedanalyses = [] - wf = getToolByName(self, 'portal_workflow') bsc = getToolByName(self, 'senaite_catalog_setup') - bac = getToolByName(self, 'senaite_catalog_analysis') - ref_type = reference.getBlank() and 'b' or 'c' - ref_uid = reference.UID() postfix = 1 for refa in reference.getReferenceAnalyses(): grid = refa.getReferenceAnalysesGroupID() diff --git a/src/bika/lims/content/instrumentmaintenancetask.py b/src/bika/lims/content/instrumentmaintenancetask.py index 53de9b4395..49fdbea1d4 100644 --- a/src/bika/lims/content/instrumentmaintenancetask.py +++ b/src/bika/lims/content/instrumentmaintenancetask.py @@ -22,7 +22,6 @@ from DateTime import DateTime from Products.Archetypes import atapi from Products.Archetypes.public import * -from Products.CMFCore.utils import getToolByName from Products.CMFPlone.utils import safe_unicode from bika.lims import api from bika.lims import bikaMessageFactory as _ @@ -170,7 +169,6 @@ def getCurrentStateI18n(self): return safe_unicode(_(self.getCurrentState()).encode('utf-8')) def getCurrentState(self): - workflow = getToolByName(self, 'portal_workflow') if self.getClosed(): return InstrumentMaintenanceTaskStatuses.CLOSED elif not api.is_active(self): diff --git a/src/bika/lims/vocabularies/__init__.py b/src/bika/lims/vocabularies/__init__.py index c4bc2fe625..e47424fda7 100644 --- a/src/bika/lims/vocabularies/__init__.py +++ b/src/bika/lims/vocabularies/__init__.py @@ -18,7 +18,6 @@ # Copyright 2018-2021 by it's authors. # Some rights reserved, see README and LICENSE. -from Acquisition import aq_get from bika.lims import bikaMessageFactory as _ from bika.lims.api import is_active from bika.lims.utils import t @@ -59,7 +58,6 @@ def __init__(self, context, key=None, value=None, contentFilter=None): def __call__(self, **kwargs): site = getSite() - request = aq_get(site, 'REQUEST', None) catalog = getToolByName(site, self.catalog) allow_blank = False if 'allow_blank' in kwargs: @@ -106,9 +104,7 @@ def __init__(self, folders, portal_types): def __call__(self, context): site = getSite() - request = aq_get(site, 'REQUEST', None) items = [] - wf = site.portal_workflow for folder in self.folders: folder = site.restrictedTraverse(folder) for portal_type in self.portal_types: @@ -321,7 +317,6 @@ class ClientContactVocabulary(object): def __call__(self, context): site = getSite() - request = aq_get(site, 'REQUEST', None) items = [] for client in site.clients.objectValues('Client'): objects = list(client.objectValues('Contact')) diff --git a/src/senaite/core/browser/dashboard/dashboard.py b/src/senaite/core/browser/dashboard/dashboard.py index 32b75bd1a7..9f124afbd1 100644 --- a/src/senaite/core/browser/dashboard/dashboard.py +++ b/src/senaite/core/browser/dashboard/dashboard.py @@ -663,7 +663,6 @@ def _getDateStr(self, period, created): elif period == PERIODICITY_MONTHLY: created = '%s-%s' % (str(created.year())[2:], str(created.month()).zfill(2)) elif period == PERIODICITY_WEEKLY: - d = (((created.day()-1)/7)*7)+1 year, weeknum, dow = created.asdatetime().isocalendar() created = created - dow created = '%s-%s-%s' % (str(created.year())[2:], str(created.month()).zfill(2), str(created.day()).zfill(2)) 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 4c07cc4c13..f48e556a88 100644 --- a/src/senaite/core/exportimport/instruments/facscalibur/calibur/model_e9750.py +++ b/src/senaite/core/exportimport/instruments/facscalibur/calibur/model_e9750.py @@ -37,8 +37,6 @@ def Import( context, request): fileformat = request.form['facs_calibur_format'] artoapply = request.form['facs_calibur_artoapply'] override = request.form['facs_calibur_override'] - sample = request.form.get('facs_calibur_sample', - 'requestid') instrument = request.form.get('instrument', None) errors = [] logs = [] @@ -70,16 +68,6 @@ def Import( context, request): elif override == 'overrideempty': over = [True, True] - sam = ['getId', 'getSampleID', 'getClientSampleID'] - if sample == 'requestid': - sam = ['getId'] - if sample == 'sampleid': - sam = ['getSampleID'] - elif sample == 'clientsid': - sam = ['getClientSampleID'] - elif sample == 'sample_clientsid': - sam = ['getSampleID', 'getClientSampleID'] - importer = FacsCalibur2Importer(parser=parser, context=context, allowed_ar_states=status, diff --git a/src/senaite/core/exportimport/instruments/foss/fiastar/fiastar.py b/src/senaite/core/exportimport/instruments/foss/fiastar/fiastar.py index ee1479b4a4..9c86b1cef6 100644 --- a/src/senaite/core/exportimport/instruments/foss/fiastar/fiastar.py +++ b/src/senaite/core/exportimport/instruments/foss/fiastar/fiastar.py @@ -49,7 +49,6 @@ class Export(BrowserView): def __call__(self, analyses): tray = 1 now = DateTime().strftime('%Y%m%d-%H%M') - bsc = getToolByName(self.context, 'senaite_catalog_setup') uc = getToolByName(self.context, 'uid_catalog') instrument = self.context.getInstrument() norm = getUtility(IIDNormalizer).normalize diff --git a/src/senaite/core/exportimport/instruments/foss/winescan/ft120.py b/src/senaite/core/exportimport/instruments/foss/winescan/ft120.py index 9fb5f418a6..d98c79091b 100644 --- a/src/senaite/core/exportimport/instruments/foss/winescan/ft120.py +++ b/src/senaite/core/exportimport/instruments/foss/winescan/ft120.py @@ -158,7 +158,6 @@ def _addRawResult(self, resid, values={}, override=False): # First, we must find if already exists a row with results for # the same date, in order to take into account replicas, Mean # and Standard Deviation - dtidx = values.get('Calibration',{}).get('Calibration',0) rows = self.getRawResults().get(resid, []) row, rows = self._extractrowbycalibration(rows, self._calibration) is_std = values.get('Rep #',{}).get('Rep #','') == 'Sd' diff --git a/src/senaite/core/exportimport/instruments/instrument.py b/src/senaite/core/exportimport/instruments/instrument.py index 277aeef3b2..adc01f3aae 100644 --- a/src/senaite/core/exportimport/instruments/instrument.py +++ b/src/senaite/core/exportimport/instruments/instrument.py @@ -34,7 +34,6 @@ def getResultsInputFile(request): def GenericImport(context, request, parser, importer=None): infile = getResultsInputFile(request) - fileformat = getFileFormat(request) artoapply = request.form['artoapply'] override = request.form['results_override'] diff --git a/src/senaite/core/exportimport/instruments/panalytical/omnia/__init__.py b/src/senaite/core/exportimport/instruments/panalytical/omnia/__init__.py index 2bf953d13a..e08b34d3bd 100644 --- a/src/senaite/core/exportimport/instruments/panalytical/omnia/__init__.py +++ b/src/senaite/core/exportimport/instruments/panalytical/omnia/__init__.py @@ -129,8 +129,6 @@ def parse_resultline(self, line): # Split by "," splitted = self.splitLine(line.strip(";")) - errors = '' - # Adjunt separated values from split by ',' for idx, result in enumerate(splitted): if result.startswith('"'): diff --git a/src/senaite/core/exportimport/setupdata/__init__.py b/src/senaite/core/exportimport/setupdata/__init__.py index 3cbb7930d2..b73cb1e301 100644 --- a/src/senaite/core/exportimport/setupdata/__init__.py +++ b/src/senaite/core/exportimport/setupdata/__init__.py @@ -515,7 +515,6 @@ def Import(self): class Lab_Products(WorksheetImporter): def Import(self): - context = self.context # Refer to the default folder folder = self.context.bika_setup.bika_labproducts # Iterate through the rows @@ -609,7 +608,7 @@ def Import(self): password = safe_unicode(row['Password']).encode('utf-8') if(username): try: - member = self.context.portal_registration.addMember( + self.context.portal_registration.addMember( username, password, properties={ @@ -1223,8 +1222,6 @@ class Storage_Locations(WorksheetImporter): def Import(self): setup_folder = self.context.bika_setup.bika_storagelocations - bsc = getToolByName(self.context, 'senaite_catalog_setup') - pc = getToolByName(self.context, 'portal_catalog') for row in self.get_rows(3): if not row['Address']: continue @@ -1688,7 +1685,6 @@ def resolve_service(self, row): return service def Import(self): - s_t = "" bucket = {} pc = getToolByName(self.context, "portal_catalog") bsc = getToolByName(self.context, "senaite_catalog_setup") @@ -2156,7 +2152,6 @@ def load_reference_analysis_interims(self, analysis): if not worksheet: return self.interim_worksheet = worksheet - bsc = getToolByName(self.context, 'senaite_catalog_setup') interims = [] for row in self.get_rows(3, worksheet=self.interim_worksheet): if row['ReferenceAnalysis_id'] != analysis.getId(): @@ -2260,8 +2255,6 @@ def load_analysis_interims(self, analysis): analysis.setInterimFields(interims) def Import(self): - bc = getToolByName(self.context, 'senaite_catalog') - bsc = getToolByName(self.context, 'senaite_catalog_setup') pc = getToolByName(self.context, 'portal_catalog') for row in self.get_rows(3): if not row['id']: diff --git a/travis_ci_flake8.cfg b/travis_ci_flake8.cfg index 0f7c521727..b4d7ea6a5c 100644 --- a/travis_ci_flake8.cfg +++ b/travis_ci_flake8.cfg @@ -79,8 +79,6 @@ extend-ignore = F812, # F821: undefined name 'Report' F821, - # F841: local variable 'icon' is assigned to but never used - F841, # F901: 'raise NotImplemented' should be 'raise NotImplementedError' F901, # W191: indentation contains tabs