Skip to content

Commit

Permalink
Merge branch 'feature/no-unused-variables' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
felliott committed May 22, 2018
2 parents 784eb69 + c77b652 commit 889bf5c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion mfr/extensions/codepygments/render.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def _render_html(self, fp, ext, *args, **kwargs):
content, encoding = None, 'utf-8'
try:
content = data.decode(encoding)
except UnicodeDecodeError as e:
except UnicodeDecodeError:
detected_encoding = chardet.detect(data)
encoding = detected_encoding.get('encoding', None)
if encoding is None:
Expand Down
2 changes: 1 addition & 1 deletion mfr/server/handlers/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def write_error(self, status_code, exc_info):

current['materialized_type'] = '.'.join([x[0] for x in exc.attr_stack])
self.error_metrics = current
except Exception as exc:
except Exception:
pass
self.set_status(exc.code)
self.finish(exc.as_html())
Expand Down

0 comments on commit 889bf5c

Please sign in to comment.