diff --git a/src/bika/lims/browser/analysisservice.py b/src/bika/lims/browser/analysisservice.py
index d44566db43..df07253c83 100644
--- a/src/bika/lims/browser/analysisservice.py
+++ b/src/bika/lims/browser/analysisservice.py
@@ -164,7 +164,7 @@ def __call__(self):
try:
minvol = minvol.split()
minvol = mg(float(minvol[0]), " ".join(minvol[1:]))
- except:
+ except Exception:
minvol = mg(0)
containers = getContainers(
diff --git a/src/bika/lims/browser/widgets/rejectionwidget.py b/src/bika/lims/browser/widgets/rejectionwidget.py
index b7ff783fc8..afd95f9854 100644
--- a/src/bika/lims/browser/widgets/rejectionwidget.py
+++ b/src/bika/lims/browser/widgets/rejectionwidget.py
@@ -24,7 +24,7 @@
try:
from zope.component.hooks import getSite
-except:
+except Exception:
# Plone < 4.3
from zope.app.component.hooks import getSite
diff --git a/src/bika/lims/browser/worksheet/views/printview.py b/src/bika/lims/browser/worksheet/views/printview.py
index e092723ac1..718677682b 100644
--- a/src/bika/lims/browser/worksheet/views/printview.py
+++ b/src/bika/lims/browser/worksheet/views/printview.py
@@ -143,7 +143,7 @@ def renderWSTemplate(self):
reptemplate = ""
try:
reptemplate = embed(self)
- except:
+ except Exception:
tbex = traceback.format_exc()
wsid = self._worksheets[self._current_ws_index].id
reptemplate = "
" % (wsid, _("Unable to load the template"), embedt, tbex)
diff --git a/src/bika/lims/content/analysisrequest.py b/src/bika/lims/content/analysisrequest.py
index 8cc4abda0c..415c882ee1 100644
--- a/src/bika/lims/content/analysisrequest.py
+++ b/src/bika/lims/content/analysisrequest.py
@@ -1828,10 +1828,9 @@ def getVerifier(self):
mtool = getToolByName(self, 'portal_membership')
verifier = None
- # noinspection PyBroadException
try:
review_history = wtool.getInfoFor(self, 'review_history')
- except: # noqa FIXME: remove blind except!
+ except Exception:
return 'access denied'
if not review_history:
@@ -2114,10 +2113,9 @@ def getRejecter(self):
"""
wtool = getToolByName(self, 'portal_workflow')
mtool = getToolByName(self, 'portal_membership')
- # noinspection PyBroadException
try:
review_history = wtool.getInfoFor(self, 'review_history')
- except: # noqa FIXME: remove blind except!
+ except Exception:
return None
for items in review_history:
action = items.get('action')
diff --git a/src/bika/lims/content/container.py b/src/bika/lims/content/container.py
index d5bad35007..b2c960ec8c 100644
--- a/src/bika/lims/content/container.py
+++ b/src/bika/lims/content/container.py
@@ -113,15 +113,15 @@ def getJSCapacity(self, **kw):
try:
mgdefault = default.split(' ', 1)
mgdefault = mg(float(mgdefault[0]), mgdefault[1])
- except:
+ except Exception:
mgdefault = mg(0, 'ml')
try:
return str(mgdefault.ounit('ml'))
- except:
+ except Exception:
pass
try:
return str(mgdefault.ounit('g'))
- except:
+ except Exception:
pass
return str(default)
diff --git a/src/bika/lims/content/instrument.py b/src/bika/lims/content/instrument.py
index b734cb8adb..7a48638e34 100644
--- a/src/bika/lims/content/instrument.py
+++ b/src/bika/lims/content/instrument.py
@@ -619,7 +619,7 @@ def addReferences(self, reference, service_uids):
cand = int(grid.split('-')[2])
if cand >= postfix:
postfix = cand + 1
- except:
+ except Exception:
pass
postfix = str(postfix).zfill(int(3))
refgid = 'I%s-%s' % (reference.id, postfix)
diff --git a/src/bika/lims/content/labproduct.py b/src/bika/lims/content/labproduct.py
index 780bdb4003..a70f619a6c 100644
--- a/src/bika/lims/content/labproduct.py
+++ b/src/bika/lims/content/labproduct.py
@@ -108,7 +108,7 @@ def getVATAmount(self):
"""
try:
vatamount = self.getTotalPrice() - Decimal(self.getPrice())
- except:
+ except Exception:
vatamount = Decimal('0.00')
return vatamount.quantize(Decimal('0.00'))
diff --git a/src/bika/lims/content/sampletype.py b/src/bika/lims/content/sampletype.py
index 01ade9d694..868002b7ec 100644
--- a/src/bika/lims/content/sampletype.py
+++ b/src/bika/lims/content/sampletype.py
@@ -247,15 +247,15 @@ def getJSMinimumVolume(self, **kw):
try:
mgdefault = default.split(' ', 1)
mgdefault = mg(float(mgdefault[0]), mgdefault[1])
- except:
+ except Exception:
mgdefault = mg(0, 'ml')
try:
return str(mgdefault.ounit('ml'))
- except:
+ except Exception:
pass
try:
return str(mgdefault.ounit('g'))
- except:
+ except Exception:
pass
return str(default)
diff --git a/src/bika/lims/jsonapi/__init__.py b/src/bika/lims/jsonapi/__init__.py
index 7409f3d72e..1eb80c7d5f 100644
--- a/src/bika/lims/jsonapi/__init__.py
+++ b/src/bika/lims/jsonapi/__init__.py
@@ -75,7 +75,7 @@ def load_brain_metadata(proxy, include_fields):
if val != Missing.Value:
try:
json.dumps(val)
- except:
+ except Exception:
continue
ret[index] = val
return ret
@@ -128,7 +128,7 @@ def load_field_values(instance, include_fields):
try:
json.dumps(val)
- except:
+ except Exception:
val = str(val)
ret[fieldname] = val
return ret
@@ -238,7 +238,7 @@ def set_fields_from_request(obj, request):
'senaite.core.browser.fields.record.RecordField']:
try:
value = eval(value)
- except:
+ except Exception:
logger.warning(
"JSONAPI: " + fieldname + ": Invalid "
"JSON/Python variable")
diff --git a/src/bika/lims/jsonapi/create.py b/src/bika/lims/jsonapi/create.py
index ae1015072f..58e0dbc44f 100644
--- a/src/bika/lims/jsonapi/create.py
+++ b/src/bika/lims/jsonapi/create.py
@@ -209,7 +209,7 @@ def create(self, context, request):
obj.aq_parent.reindexObject()
event.notify(ObjectInitializedEvent(obj))
obj.at_post_create_script()
- except:
+ except Exception:
savepoint.rollback()
raise
diff --git a/src/bika/lims/jsonapi/update.py b/src/bika/lims/jsonapi/update.py
index 20841cf112..c436457119 100644
--- a/src/bika/lims/jsonapi/update.py
+++ b/src/bika/lims/jsonapi/update.py
@@ -152,7 +152,7 @@ def update(self, context, request):
return ret
for field in fields:
self.used(field)
- except:
+ except Exception:
savepoint.rollback()
raise
@@ -238,7 +238,7 @@ def update_many(self, context, request):
else:
this_ret['success'] = True
this_ret['error'] = False
- except:
+ except Exception:
savepoint.rollback()
raise
ret['updates'].append(this_ret)
diff --git a/src/bika/lims/utils/__init__.py b/src/bika/lims/utils/__init__.py
index b0742bd19b..6f3d5a33d3 100644
--- a/src/bika/lims/utils/__init__.py
+++ b/src/bika/lims/utils/__init__.py
@@ -202,7 +202,7 @@ def formatDecimalMark(value, decimalmark='.'):
rawval = str(value)
try:
return decimalmark.join(rawval.split('.'))
- except:
+ except Exception:
return rawval
@@ -479,7 +479,7 @@ def getHiddenAttributesForClass(classname):
for alist in hiddenattributes:
if alist[0] == classname:
return alist[1:]
- except:
+ except Exception:
logger.warning(
'Probem accessing optionally hidden attributes in registry')
diff --git a/src/bika/lims/validators.py b/src/bika/lims/validators.py
index 7e08350980..62fa5afb01 100644
--- a/src/bika/lims/validators.py
+++ b/src/bika/lims/validators.py
@@ -1020,7 +1020,7 @@ def __call__(self, value, *args, **kwargs):
for v in value.values():
try:
int(v)
- except:
+ except Exception:
return to_utf8(
translate(_("Validation failed: Values must be numbers")))
return True
@@ -1103,7 +1103,7 @@ def __call__(self, value, *args, **kwargs):
try:
value = float(value)
- except:
+ except Exception:
msg = _("Validation failed: percent values must be numbers")
return to_utf8(translate(msg))
@@ -1329,7 +1329,7 @@ def __call__(self, value, *args, **kwargs):
translate = getToolByName(instance, 'translation_service').translate
try:
value = float(value)
- except:
+ except Exception:
msg = _("Validation failed: value must be float")
return to_utf8(translate(msg))
diff --git a/src/senaite/core/browser/fields/record.py b/src/senaite/core/browser/fields/record.py
index d62b7491c8..2bcc6093a2 100644
--- a/src/senaite/core/browser/fields/record.py
+++ b/src/senaite/core/browser/fields/record.py
@@ -235,7 +235,7 @@ def set(self, instance, value, **kwargs):
try:
value = eval(value)
# more checks to add?
- except: # what to catch here?
+ except Exception: # what to catch here?
pass
value = self._to_dict(value)
value = self._decode_strings(value, instance, **kwargs)
@@ -262,7 +262,7 @@ def _decode_strings(self, value, instance, **kwargs):
if self.subfield_types.get(k, None) == 'datetime':
try:
val = DateTime(v)
- except:
+ except Exception:
val = None
new_value[k] = val
diff --git a/src/senaite/core/exportimport/instruments/abaxis/vetscan/vs2.py b/src/senaite/core/exportimport/instruments/abaxis/vetscan/vs2.py
index 960dd5b86e..b34fb5c2b6 100644
--- a/src/senaite/core/exportimport/instruments/abaxis/vetscan/vs2.py
+++ b/src/senaite/core/exportimport/instruments/abaxis/vetscan/vs2.py
@@ -76,7 +76,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/abbott/m2000rt/m2000rt.py b/src/senaite/core/exportimport/instruments/abbott/m2000rt/m2000rt.py
index cf1fd6c570..6a9c11092c 100644
--- a/src/senaite/core/exportimport/instruments/abbott/m2000rt/m2000rt.py
+++ b/src/senaite/core/exportimport/instruments/abbott/m2000rt/m2000rt.py
@@ -94,7 +94,7 @@ def Import(context, request):
try:
# run the parser and save results
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/alere/pima/beads.py b/src/senaite/core/exportimport/instruments/alere/pima/beads.py
index 3c7835aa63..08e5e34244 100644
--- a/src/senaite/core/exportimport/instruments/alere/pima/beads.py
+++ b/src/senaite/core/exportimport/instruments/alere/pima/beads.py
@@ -76,7 +76,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/alere/pima/cd4.py b/src/senaite/core/exportimport/instruments/alere/pima/cd4.py
index 68e777f6c6..936662e892 100644
--- a/src/senaite/core/exportimport/instruments/alere/pima/cd4.py
+++ b/src/senaite/core/exportimport/instruments/alere/pima/cd4.py
@@ -76,7 +76,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/beckmancoulter/access/model2.py b/src/senaite/core/exportimport/instruments/beckmancoulter/access/model2.py
index a8381627a9..7870abd388 100644
--- a/src/senaite/core/exportimport/instruments/beckmancoulter/access/model2.py
+++ b/src/senaite/core/exportimport/instruments/beckmancoulter/access/model2.py
@@ -76,7 +76,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/biodrop/ulite/ulite.py b/src/senaite/core/exportimport/instruments/biodrop/ulite/ulite.py
index cf4551cec4..b83dff616e 100644
--- a/src/senaite/core/exportimport/instruments/biodrop/ulite/ulite.py
+++ b/src/senaite/core/exportimport/instruments/biodrop/ulite/ulite.py
@@ -83,7 +83,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/cobasintegra/model_400_plus/model_400_plus.py b/src/senaite/core/exportimport/instruments/cobasintegra/model_400_plus/model_400_plus.py
index ad9ef7b44d..4f6fc915c1 100644
--- a/src/senaite/core/exportimport/instruments/cobasintegra/model_400_plus/model_400_plus.py
+++ b/src/senaite/core/exportimport/instruments/cobasintegra/model_400_plus/model_400_plus.py
@@ -76,7 +76,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/eltra/cs/cs2000.py b/src/senaite/core/exportimport/instruments/eltra/cs/cs2000.py
index 7822001f7f..b50c5aff00 100644
--- a/src/senaite/core/exportimport/instruments/eltra/cs/cs2000.py
+++ b/src/senaite/core/exportimport/instruments/eltra/cs/cs2000.py
@@ -80,7 +80,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
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 f48e556a88..4fa9320eb1 100644
--- a/src/senaite/core/exportimport/instruments/facscalibur/calibur/model_e9750.py
+++ b/src/senaite/core/exportimport/instruments/facscalibur/calibur/model_e9750.py
@@ -77,7 +77,7 @@ def Import( context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/foss/fiastar/fiastar.py b/src/senaite/core/exportimport/instruments/foss/fiastar/fiastar.py
index 9c86b1cef6..064983b855 100644
--- a/src/senaite/core/exportimport/instruments/foss/fiastar/fiastar.py
+++ b/src/senaite/core/exportimport/instruments/foss/fiastar/fiastar.py
@@ -156,7 +156,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/foss/winescan/auto.py b/src/senaite/core/exportimport/instruments/foss/winescan/auto.py
index 5cafb06044..86a31292e9 100644
--- a/src/senaite/core/exportimport/instruments/foss/winescan/auto.py
+++ b/src/senaite/core/exportimport/instruments/foss/winescan/auto.py
@@ -75,7 +75,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/foss/winescan/ft120.py b/src/senaite/core/exportimport/instruments/foss/winescan/ft120.py
index d98c79091b..fa6dd47509 100644
--- a/src/senaite/core/exportimport/instruments/foss/winescan/ft120.py
+++ b/src/senaite/core/exportimport/instruments/foss/winescan/ft120.py
@@ -78,7 +78,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
@@ -143,7 +143,7 @@ def _addRawResult(self, resid, values={}, override=False):
from datetime import datetime
dtobj = datetime.strptime(dtstr, '%d/%m/%Y %H:%M %p')
dateTime = dtobj.strftime("%Y%m%d %H:%M")
- except:
+ except Exception:
pass
del values['Date']
del values['Time']
diff --git a/src/senaite/core/exportimport/instruments/generic/two_dimension.py b/src/senaite/core/exportimport/instruments/generic/two_dimension.py
index d98f15f4e1..684bd2911b 100644
--- a/src/senaite/core/exportimport/instruments/generic/two_dimension.py
+++ b/src/senaite/core/exportimport/instruments/generic/two_dimension.py
@@ -69,7 +69,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/genexpert/genexpert.py b/src/senaite/core/exportimport/instruments/genexpert/genexpert.py
index d7ebc83c5f..54d332119a 100644
--- a/src/senaite/core/exportimport/instruments/genexpert/genexpert.py
+++ b/src/senaite/core/exportimport/instruments/genexpert/genexpert.py
@@ -83,7 +83,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/horiba/jobinyvon/icp.py b/src/senaite/core/exportimport/instruments/horiba/jobinyvon/icp.py
index e3580ef60d..9e23827826 100644
--- a/src/senaite/core/exportimport/instruments/horiba/jobinyvon/icp.py
+++ b/src/senaite/core/exportimport/instruments/horiba/jobinyvon/icp.py
@@ -73,7 +73,7 @@ def __call__(self, context, request):
exception_string = ''
try:
importer.process()
- except:
+ except Exception:
exception_string = traceback.format_exc()
self.errors = importer.errors
self.logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/instrument.py b/src/senaite/core/exportimport/instruments/instrument.py
index adc01f3aae..ab3f9b8214 100644
--- a/src/senaite/core/exportimport/instruments/instrument.py
+++ b/src/senaite/core/exportimport/instruments/instrument.py
@@ -73,7 +73,7 @@ def GenericImport(context, request, parser, importer=None):
tbex = ''
try:
imp.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = imp.errors
logs = imp.logs
diff --git a/src/senaite/core/exportimport/instruments/lachat/quickchem.py b/src/senaite/core/exportimport/instruments/lachat/quickchem.py
index 91bd8fa9b5..c251c240e9 100644
--- a/src/senaite/core/exportimport/instruments/lachat/quickchem.py
+++ b/src/senaite/core/exportimport/instruments/lachat/quickchem.py
@@ -170,7 +170,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/lifetechnologies/qubit/__init__.py b/src/senaite/core/exportimport/instruments/lifetechnologies/qubit/__init__.py
index 8b7694a504..38f05ce52d 100644
--- a/src/senaite/core/exportimport/instruments/lifetechnologies/qubit/__init__.py
+++ b/src/senaite/core/exportimport/instruments/lifetechnologies/qubit/__init__.py
@@ -55,7 +55,7 @@ def _parseline(self, line):
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")
- except:
+ except Exception:
pass
# add result
diff --git a/src/senaite/core/exportimport/instruments/lifetechnologies/qubit/qubit.py b/src/senaite/core/exportimport/instruments/lifetechnologies/qubit/qubit.py
index 1ef43a3bb4..48c512da0e 100644
--- a/src/senaite/core/exportimport/instruments/lifetechnologies/qubit/qubit.py
+++ b/src/senaite/core/exportimport/instruments/lifetechnologies/qubit/qubit.py
@@ -82,7 +82,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/metler/toledo/dl55.py b/src/senaite/core/exportimport/instruments/metler/toledo/dl55.py
index c3c9513af5..970bcfd497 100644
--- a/src/senaite/core/exportimport/instruments/metler/toledo/dl55.py
+++ b/src/senaite/core/exportimport/instruments/metler/toledo/dl55.py
@@ -151,7 +151,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/nuclisens/easyq.py b/src/senaite/core/exportimport/instruments/nuclisens/easyq.py
index b7873cc4ba..f81669598e 100644
--- a/src/senaite/core/exportimport/instruments/nuclisens/easyq.py
+++ b/src/senaite/core/exportimport/instruments/nuclisens/easyq.py
@@ -233,7 +233,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/panalytical/omnia/__init__.py b/src/senaite/core/exportimport/instruments/panalytical/omnia/__init__.py
index e08b34d3bd..2beacbab1e 100644
--- a/src/senaite/core/exportimport/instruments/panalytical/omnia/__init__.py
+++ b/src/senaite/core/exportimport/instruments/panalytical/omnia/__init__.py
@@ -157,7 +157,7 @@ def parse_resultline(self, line):
try:
rawdict['DateTime'] = {'DateTime':self.csvDate2BikaDate(self._header['Date']),
'DefaultValue':'DateTime'}
- except:
+ except Exception:
pass
if not rid:
self.err("No Sample defined", numline=self._numline)
@@ -497,7 +497,7 @@ def parse_resultline(self, line):
try:
raw['DateTime'] = {'DateTime':self.csvDate2BikaDate(self._header['Date']),
'DefaultValue':'DateTime'}
- except:
+ except Exception:
pass
self._addRawResult(rid, raw, True)
diff --git a/src/senaite/core/exportimport/instruments/panalytical/omnia/axios_xrf.py b/src/senaite/core/exportimport/instruments/panalytical/omnia/axios_xrf.py
index cfbb944017..205bf455d7 100644
--- a/src/senaite/core/exportimport/instruments/panalytical/omnia/axios_xrf.py
+++ b/src/senaite/core/exportimport/instruments/panalytical/omnia/axios_xrf.py
@@ -78,7 +78,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/rigaku/supermini/wxrf.py b/src/senaite/core/exportimport/instruments/rigaku/supermini/wxrf.py
index 11f3401dc7..4a8d1aab31 100644
--- a/src/senaite/core/exportimport/instruments/rigaku/supermini/wxrf.py
+++ b/src/senaite/core/exportimport/instruments/rigaku/supermini/wxrf.py
@@ -74,7 +74,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/rochecobas/taqman/model48.py b/src/senaite/core/exportimport/instruments/rochecobas/taqman/model48.py
index e3c1c46bdb..4e4e38ddf3 100644
--- a/src/senaite/core/exportimport/instruments/rochecobas/taqman/model48.py
+++ b/src/senaite/core/exportimport/instruments/rochecobas/taqman/model48.py
@@ -167,7 +167,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/rochecobas/taqman/model96.py b/src/senaite/core/exportimport/instruments/rochecobas/taqman/model96.py
index 91ddad4c5f..e183f56b47 100644
--- a/src/senaite/core/exportimport/instruments/rochecobas/taqman/model96.py
+++ b/src/senaite/core/exportimport/instruments/rochecobas/taqman/model96.py
@@ -154,7 +154,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/sealanalytical/aq2/aq2.py b/src/senaite/core/exportimport/instruments/sealanalytical/aq2/aq2.py
index c1d21dfbcb..f92c630d51 100644
--- a/src/senaite/core/exportimport/instruments/sealanalytical/aq2/aq2.py
+++ b/src/senaite/core/exportimport/instruments/sealanalytical/aq2/aq2.py
@@ -76,7 +76,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/shimadzu/gcms/qp2010se.py b/src/senaite/core/exportimport/instruments/shimadzu/gcms/qp2010se.py
index 84cc0e5ab8..76e679ff9c 100644
--- a/src/senaite/core/exportimport/instruments/shimadzu/gcms/qp2010se.py
+++ b/src/senaite/core/exportimport/instruments/shimadzu/gcms/qp2010se.py
@@ -76,7 +76,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/shimadzu/gcms/tq8030.py b/src/senaite/core/exportimport/instruments/shimadzu/gcms/tq8030.py
index 049032a5e8..89c481da7f 100644
--- a/src/senaite/core/exportimport/instruments/shimadzu/gcms/tq8030.py
+++ b/src/senaite/core/exportimport/instruments/shimadzu/gcms/tq8030.py
@@ -75,7 +75,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/shimadzu/icpe/multitype.py b/src/senaite/core/exportimport/instruments/shimadzu/icpe/multitype.py
index 44fa8d6b8c..1e7300527f 100644
--- a/src/senaite/core/exportimport/instruments/shimadzu/icpe/multitype.py
+++ b/src/senaite/core/exportimport/instruments/shimadzu/icpe/multitype.py
@@ -77,7 +77,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/shimadzu/nexera/LC2040C.py b/src/senaite/core/exportimport/instruments/shimadzu/nexera/LC2040C.py
index a866138e35..8f6bf22ca9 100644
--- a/src/senaite/core/exportimport/instruments/shimadzu/nexera/LC2040C.py
+++ b/src/senaite/core/exportimport/instruments/shimadzu/nexera/LC2040C.py
@@ -74,7 +74,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/shimadzu/nexera/LCMS8050.py b/src/senaite/core/exportimport/instruments/shimadzu/nexera/LCMS8050.py
index 3b770a5de8..7feee8338d 100644
--- a/src/senaite/core/exportimport/instruments/shimadzu/nexera/LCMS8050.py
+++ b/src/senaite/core/exportimport/instruments/shimadzu/nexera/LCMS8050.py
@@ -74,7 +74,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/sysmex/xs/i500.py b/src/senaite/core/exportimport/instruments/sysmex/xs/i500.py
index a8ab765f4b..debb40fe26 100644
--- a/src/senaite/core/exportimport/instruments/sysmex/xs/i500.py
+++ b/src/senaite/core/exportimport/instruments/sysmex/xs/i500.py
@@ -107,7 +107,7 @@ def Import(context, request, instrumentname='sysmex_xs_500i'):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/sysmex/xt/i1800.py b/src/senaite/core/exportimport/instruments/sysmex/xt/i1800.py
index 8ae05da534..5dfbf46308 100644
--- a/src/senaite/core/exportimport/instruments/sysmex/xt/i1800.py
+++ b/src/senaite/core/exportimport/instruments/sysmex/xt/i1800.py
@@ -78,7 +78,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/sysmex/xt/i4000.py b/src/senaite/core/exportimport/instruments/sysmex/xt/i4000.py
index c0506c37c1..6664401b23 100644
--- a/src/senaite/core/exportimport/instruments/sysmex/xt/i4000.py
+++ b/src/senaite/core/exportimport/instruments/sysmex/xt/i4000.py
@@ -81,7 +81,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/tescan/tima/__init__.py b/src/senaite/core/exportimport/instruments/tescan/tima/__init__.py
index 606586ff0c..da01067410 100644
--- a/src/senaite/core/exportimport/instruments/tescan/tima/__init__.py
+++ b/src/senaite/core/exportimport/instruments/tescan/tima/__init__.py
@@ -62,7 +62,7 @@ def _parseline(self, line):
dtstr = '%s %s' % (_values['Date'], _values['Time'])
dtobj = datetime.strptime(dtstr, '%d/%m/%Y %H:%M:%S')
vals['DateTime'] = dtobj.strftime("%Y%m%d %H:%M:%S")
- except:
+ except Exception:
pass
rawdict = {acode: vals}
diff --git a/src/senaite/core/exportimport/instruments/tescan/tima/tima.py b/src/senaite/core/exportimport/instruments/tescan/tima/tima.py
index 969c07859c..c6ed3199d1 100644
--- a/src/senaite/core/exportimport/instruments/tescan/tima/tima.py
+++ b/src/senaite/core/exportimport/instruments/tescan/tima/tima.py
@@ -75,7 +75,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/thermoscientific/arena/xt20.py b/src/senaite/core/exportimport/instruments/thermoscientific/arena/xt20.py
index e11a54755b..76a77736a1 100644
--- a/src/senaite/core/exportimport/instruments/thermoscientific/arena/xt20.py
+++ b/src/senaite/core/exportimport/instruments/thermoscientific/arena/xt20.py
@@ -74,7 +74,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/thermoscientific/gallery/Ts9861x.py b/src/senaite/core/exportimport/instruments/thermoscientific/gallery/Ts9861x.py
index b36b9231f3..6295b03874 100644
--- a/src/senaite/core/exportimport/instruments/thermoscientific/gallery/Ts9861x.py
+++ b/src/senaite/core/exportimport/instruments/thermoscientific/gallery/Ts9861x.py
@@ -75,7 +75,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/thermoscientific/multiskan/go.py b/src/senaite/core/exportimport/instruments/thermoscientific/multiskan/go.py
index 2c6236a06c..4a6ba269a3 100644
--- a/src/senaite/core/exportimport/instruments/thermoscientific/multiskan/go.py
+++ b/src/senaite/core/exportimport/instruments/thermoscientific/multiskan/go.py
@@ -79,7 +79,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/instruments/varian/vistapro/icp.py b/src/senaite/core/exportimport/instruments/varian/vistapro/icp.py
index 8183ea80f5..924f45baff 100644
--- a/src/senaite/core/exportimport/instruments/varian/vistapro/icp.py
+++ b/src/senaite/core/exportimport/instruments/varian/vistapro/icp.py
@@ -171,7 +171,7 @@ def Import(context, request):
tbex = ''
try:
importer.process()
- except:
+ except Exception:
tbex = traceback.format_exc()
errors = importer.errors
logs = importer.logs
diff --git a/src/senaite/core/exportimport/load_setup_data.py b/src/senaite/core/exportimport/load_setup_data.py
index 4f6ae52186..022246247d 100644
--- a/src/senaite/core/exportimport/load_setup_data.py
+++ b/src/senaite/core/exportimport/load_setup_data.py
@@ -60,7 +60,7 @@ def solve_deferred(self, deferred=None):
tool = getToolByName(self.context, d['dest_catalog'])
try:
proxies = tool(d['dest_query'])
- except:
+ except Exception:
continue
if len(proxies) > 0:
obj = proxies[0].getObject()
diff --git a/src/senaite/core/exportimport/setupdata/__init__.py b/src/senaite/core/exportimport/setupdata/__init__.py
index b73cb1e301..f4ffa5dca2 100644
--- a/src/senaite/core/exportimport/setupdata/__init__.py
+++ b/src/senaite/core/exportimport/setupdata/__init__.py
@@ -175,7 +175,7 @@ def get_file_data(self, filename):
self.dataset_project,
"setupdata/%s/%s" % (self.dataset_name, filename))
file_data = open(path, "rb").read()
- except:
+ except Exception:
file_data = None
else:
file_data = None
@@ -188,15 +188,15 @@ def to_bool(self, value):
try:
value = value.lower()
- except:
+ except Exception:
pass
try:
value = value.encode('utf-8')
- except:
+ except Exception:
pass
try:
value = int(value)
- except:
+ except Exception:
pass
if value in ('true', 1):
return True
@@ -211,7 +211,7 @@ def to_int(self, value, default=0):
except ValueError:
try:
return int(default)
- except:
+ except Exception:
return 0
def to_float(self, value, default=0):
@@ -222,7 +222,7 @@ def to_float(self, value, default=0):
except ValueError:
try:
return float(default)
- except:
+ except Exception:
return 0.0
def defer(self, **kwargs):
@@ -275,7 +275,7 @@ def fill_contactfields(self, row, obj):
for fieldname in fieldnames:
try:
field = fields[fieldname]
- except:
+ except Exception:
if fieldname in row:
logger.info("Address field %s not found on %s"%(fieldname,obj))
continue
@@ -1038,7 +1038,7 @@ def Import(self):
obj = _createObjectByType("InstrumentMaintenanceTask", folder, tmpID())
try:
cost = "%.2f" % (row.get('cost', 0))
- except:
+ except Exception:
cost = row.get('cost', '0.0')
obj.edit(
@@ -1970,7 +1970,7 @@ def get_field_value(self, field, value):
}
try:
return converters.get(field.type, None)(field, value)
- except:
+ except Exception:
logger.error("No valid type for Setup.{} ({}): {}"
.format(field.getName(), field.type, value))
@@ -2050,7 +2050,7 @@ def Import(self):
try:
obj_field = bsetup.getField(field_name)
obj_field.set(bsetup, str(value))
- except:
+ except Exception:
logger.error("No valid type for Setup.{} ({}): {}"
.format(field_name, field.type, value))
diff --git a/travis_ci_flake8.cfg b/travis_ci_flake8.cfg
index 6ab8259a94..a53f1443de 100644
--- a/travis_ci_flake8.cfg
+++ b/travis_ci_flake8.cfg
@@ -69,8 +69,6 @@ extend-ignore =
E501,
# E502: the backslash is redundant between brackets
E502,
- # E722: do not use bare 'except'
- E722,
# F821: undefined name 'Report'
F821,
# F901: 'raise NotImplemented' should be 'raise NotImplementedError'