Enable checks for "not in" order (E713) and semicolon at line end (E7…

…03) (#2091)

* Remove unused import

* Enable check for "not in" order (E713)

* Enable check for semicolon at line end (E703)

* Clean up existing violations of E703 and E713

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:

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):

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)

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

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
 

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'}

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)
 

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))

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