Fix use of bare Except blocking precommit hooks

collective · Apr 14, 2020 · 3507efc · 3507efc
1 parent 33da7eb
commit 3507efc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/collective/documentgenerator/events/styles_events.py b/src/collective/documentgenerator/events/styles_events.py
@@ -96,13 +96,11 @@ def _update_template_styles(pod_template, style_template_filename):
         logger.error("Error is '%s'" % stderr)
         portal = api.portal.get()
         request = portal.REQUEST
-        try:
-            api.portal.show_message(message=_(u"Problem during styles update on template '${tmpl}': ${err}",
-                                              mapping={'tmpl': safe_unicode(pod_template.absolute_url_path()),
-                                                       'err': safe_unicode(stderr)}),
-                                    request=request, type='error')
-        except:
-            pass
+        api.portal.show_message(message=_(u"Problem during styles update on template '${tmpl}': ${err}",
+                                          mapping={'tmpl': safe_unicode(pod_template.absolute_url_path()),
+                                                   'err': safe_unicode(stderr)}),
+                                request=request,
+                                type='error')
         raise Redirect(request.get('ACTUAL_URL'),
                        translate(_(u"Problem during styles update on template '${tmpl}': ${err}",
                                    mapping={'tmpl': safe_unicode(pod_template.absolute_url_path()),

diff --git a/src/collective/documentgenerator/helper/base.py b/src/collective/documentgenerator/helper/base.py
@@ -200,10 +200,10 @@ def mailed_context(self, mailed_data):
             for key in ('mailing_list', 'mailed_doc'):
                 if key in new_context:
                     del new_context[key]
-        except:
+            new_context['mailed_data'] = mailed_data
+            return new_context
+        except AttributeError:  # in case one object is None starting with self.appy_renderer
             return {'mailed_data': mailed_data}
-        new_context['mailed_data'] = mailed_data
-        return new_context
 
     def do_mailing(self):
         """ Check if mailing data must be replaced in template """