diff --git a/src/bika/lims/browser/widgets/partitionsetupwidget.py b/src/bika/lims/browser/widgets/partitionsetupwidget.py index 0e12b151db..820aae4e2a 100644 --- a/src/bika/lims/browser/widgets/partitionsetupwidget.py +++ b/src/bika/lims/browser/widgets/partitionsetupwidget.py @@ -50,10 +50,10 @@ def process_form(self, instance, field, form, empty_marker = None, newvalue = [] for v in value: v = dict(v) - if v.get('separate', '') == 'on' and not 'preservation' in v: - container_uid = v.get('container', [''])[0]; + if v.get('separate', '') == 'on' and 'preservation' not in v: + container_uid = v.get('container', [''])[0] if container_uid: - container = bsc(UID=container_uid)[0].getObject(); + container = bsc(UID=container_uid)[0].getObject() if container.getPrePreserved(): pres = container.getPreservation() if pres: diff --git a/src/senaite/core/browser/fields/record.py b/src/senaite/core/browser/fields/record.py index 1fdd0388b3..d62b7491c8 100644 --- a/src/senaite/core/browser/fields/record.py +++ b/src/senaite/core/browser/fields/record.py @@ -19,7 +19,6 @@ # Some rights reserved, see README and LICENSE. import six -from types import ClassType from types import DictType from types import ListType from types import StringType @@ -329,7 +328,7 @@ def _subfieldValidationLayer(self, subfield): log('WARNING: Unknow validation %s. Disabling!' % current_validators) validators = () - if not subfield in self.required_subfields: + if subfield not in self.required_subfields: if validators == (): validators = ValidationChain(chainname) if len(validators): diff --git a/src/senaite/core/exportimport/instruments/biodrop/ulite/__init__.py b/src/senaite/core/exportimport/instruments/biodrop/ulite/__init__.py index b06c8e47ba..6966986b96 100644 --- a/src/senaite/core/exportimport/instruments/biodrop/ulite/__init__.py +++ b/src/senaite/core/exportimport/instruments/biodrop/ulite/__init__.py @@ -54,7 +54,7 @@ def _parseline(self, line): for d in (row_values, self.file_header): raw_result.update(d) raw_result['DefaultResult'] = 'Concentration' - raw_result = {self.analysiskey: raw_result}; + raw_result = {self.analysiskey: raw_result} sample_id = row_values['Sample Name'] self._addRawResult(sample_id, raw_result) diff --git a/src/senaite/core/exportimport/instruments/foss/fiastar/fiastar.py b/src/senaite/core/exportimport/instruments/foss/fiastar/fiastar.py index b19f0e9acd..ee1479b4a4 100644 --- a/src/senaite/core/exportimport/instruments/foss/fiastar/fiastar.py +++ b/src/senaite/core/exportimport/instruments/foss/fiastar/fiastar.py @@ -69,7 +69,7 @@ def __call__(self, analyses): a_uid = layout[x]['analysis_uid'] p_uid = uc(UID=a_uid)[0].getObject().aq_parent.UID() layout[x]['parent_uid'] = p_uid - if not p_uid in parent_to_slot.keys(): + if p_uid not in parent_to_slot.keys(): parent_to_slot[p_uid] = int(layout[x]['position']) # write rows, one per PARENT diff --git a/src/senaite/core/exportimport/instruments/lifetechnologies/qubit/__init__.py b/src/senaite/core/exportimport/instruments/lifetechnologies/qubit/__init__.py index de8ff7e6d5..8b7694a504 100644 --- a/src/senaite/core/exportimport/instruments/lifetechnologies/qubit/__init__.py +++ b/src/senaite/core/exportimport/instruments/lifetechnologies/qubit/__init__.py @@ -54,7 +54,7 @@ def _parseline(self, line): # 2010/11/02,10:33 AM dtstr = '%s %s' % (_values['Date'], _values['Time']) dtobj = datetime.strptime(dtstr, '%Y/%m/%d %H:%M %p') - values[self.analysiskey]['DateTime'] = dtobj.strftime("%Y%m%d %H:%M:%S"); + values[self.analysiskey]['DateTime'] = dtobj.strftime("%Y%m%d %H:%M:%S") except: pass diff --git a/src/senaite/core/exportimport/instruments/panalytical/omnia/__init__.py b/src/senaite/core/exportimport/instruments/panalytical/omnia/__init__.py index 86c548d964..2bf953d13a 100644 --- a/src/senaite/core/exportimport/instruments/panalytical/omnia/__init__.py +++ b/src/senaite/core/exportimport/instruments/panalytical/omnia/__init__.py @@ -495,7 +495,7 @@ def parse_resultline(self, line): rawres = self.getRawResults().get(rid, []) raw = rawres[0] if len(rawres) > 0 else {} raw[aname] = rawdict - if not 'DateTime' in raw: + if 'DateTime' not in raw: try: raw['DateTime'] = {'DateTime':self.csvDate2BikaDate(self._header['Date']), 'DefaultValue':'DateTime'} diff --git a/src/senaite/core/tests/test_calculations.py b/src/senaite/core/tests/test_calculations.py index a5ac9ec460..da173dc117 100644 --- a/src/senaite/core/tests/test_calculations.py +++ b/src/senaite/core/tests/test_calculations.py @@ -398,7 +398,7 @@ def test_calculation_fixed_precision(self): for k,v in f['interims'].items(): interims.append({'keyword': k, 'title':k, 'value': v, 'hidden': False, 'type': 'int', - 'unit': ''}); + 'unit': ''}) self.calculation.setInterimFields(interims) self.assertEqual(self.calculation.getInterimFields(), interims) diff --git a/src/senaite/core/tests/test_hiddenanalyses.py b/src/senaite/core/tests/test_hiddenanalyses.py index 835cedb08e..240f9ff3fe 100644 --- a/src/senaite/core/tests/test_hiddenanalyses.py +++ b/src/senaite/core/tests/test_hiddenanalyses.py @@ -103,7 +103,7 @@ def test_service_hidden_profile(self): self.assertFalse('hidden' in self.analysisprofile.getAnalysisServiceSettings(uid)) # Modify visibility for Calcium in profile - uid = self.services[0].UID(); + uid = self.services[0].UID() sets = [{'uid': uid}] self.analysisprofile.setAnalysisServicesSettings(sets) self.assertFalse(self.analysisprofile.isAnalysisServiceHidden(uid)) @@ -119,7 +119,7 @@ def test_service_hidden_profile(self): self.assertTrue('hidden' in self.analysisprofile.getAnalysisServiceSettings(uid)) # Modify visibility for Cooper in profile - uid = self.services[1].UID(); + uid = self.services[1].UID() sets = [{'uid': uid}] self.analysisprofile.setAnalysisServicesSettings(sets) self.assertFalse(self.analysisprofile.isAnalysisServiceHidden(uid)) @@ -134,7 +134,7 @@ def test_service_hidden_profile(self): self.assertTrue('hidden' in self.analysisprofile.getAnalysisServiceSettings(uid)) # Modify visibility for Iron in profile - uid = self.services[2].UID(); + uid = self.services[2].UID() sets = [{'uid': uid}] self.analysisprofile.setAnalysisServicesSettings(sets) self.assertTrue(self.analysisprofile.isAnalysisServiceHidden(uid)) @@ -154,7 +154,7 @@ def test_service_hidden_profile(self): def test_service_hidden_artemplate(self): # Template # For Calcium (unset) - uid = self.services[0].UID(); + uid = self.services[0].UID() self.assertFalse(self.services[0].getHidden()) self.assertFalse(self.analysisprofile.isAnalysisServiceHidden(uid)) self.assertFalse('hidden' in self.artemplate.getAnalysisServiceSettings(uid)) @@ -172,7 +172,7 @@ def test_service_hidden_artemplate(self): self.assertFalse('hidden' in self.artemplate.getAnalysisServiceSettings(uid)) # Modify visibility for Calcium in template - uid = self.services[0].UID(); + uid = self.services[0].UID() sets = [{'uid': uid}] self.artemplate.setAnalysisServicesSettings(sets) self.assertFalse(self.artemplate.isAnalysisServiceHidden(uid)) @@ -188,7 +188,7 @@ def test_service_hidden_artemplate(self): self.assertTrue('hidden' in self.artemplate.getAnalysisServiceSettings(uid)) # Modify visibility for Cooper in template - uid = self.services[1].UID(); + uid = self.services[1].UID() sets = [{'uid': uid}] self.artemplate.setAnalysisServicesSettings(sets) self.assertFalse(self.artemplate.isAnalysisServiceHidden(uid)) @@ -203,7 +203,7 @@ def test_service_hidden_artemplate(self): self.assertTrue('hidden' in self.artemplate.getAnalysisServiceSettings(uid)) # Modify visibility for Iron in template - uid = self.services[2].UID(); + uid = self.services[2].UID() sets = [{'uid': uid}] self.artemplate.setAnalysisServicesSettings(sets) self.assertTrue(self.artemplate.isAnalysisServiceHidden(uid)) diff --git a/travis_ci_flake8.cfg b/travis_ci_flake8.cfg index 94b72aabad..fcd2aa30f9 100644 --- a/travis_ci_flake8.cfg +++ b/travis_ci_flake8.cfg @@ -71,10 +71,6 @@ extend-ignore = E501, # E502: the backslash is redundant between brackets E502, - # E703: statement ends with a semicolon - E703, - # E713: test for membership should be 'not in' - E713, # E722: do not use bare 'except' E722, # F403: 'from bika.lims.permissions import *' used; unable to detect undefined names