Fix UnboundLocalError in logger exceptions handling code

This commit is contained in:
ZyX 2014-09-21 15:51:32 +04:00
parent 679b66466f
commit 345025ed60

View File

@ -744,16 +744,12 @@ class Powerline(object):
self.update_renderer() self.update_renderer()
return self.renderer.render(*args, **kwargs) return self.renderer.render(*args, **kwargs)
except Exception as e: except Exception as e:
exc = e
try: try:
self.exception('Failed to render: {0}', str(e)) self.exception('Failed to render: {0}', str(e))
except Exception as e: except Exception as e:
# Updates e variable to new value, masking previous one. exc = e
# Normally it is the same exception (due to raise in case pl is return FailedUnicode(safe_unicode(exc))
# unset), but it may also show error in logger. Note that latter
# is not logged by logger for obvious reasons, thus this also
# prevents us from seeing logger traceback.
pass
return FailedUnicode(safe_unicode(e))
def render_above_lines(self, *args, **kwargs): def render_above_lines(self, *args, **kwargs):
'''Like .render(), but for ``self.renderer.render_above_lines()`` '''Like .render(), but for ``self.renderer.render_above_lines()``
@ -763,16 +759,12 @@ class Powerline(object):
for line in self.renderer.render_above_lines(*args, **kwargs): for line in self.renderer.render_above_lines(*args, **kwargs):
yield line yield line
except Exception as e: except Exception as e:
exc = e
try: try:
self.exception('Failed to render: {0}', str(e)) self.exception('Failed to render: {0}', str(e))
except Exception as e: except Exception as e:
# Updates e variable to new value, masking previous one. exc = e
# Normally it is the same exception (due to raise in case pl is yield FailedUnicode(safe_unicode(exc))
# unset), but it may also show error in logger. Note that latter
# is not logged by logger for obvious reasons, thus this also
# prevents us from seeing logger traceback.
pass
yield FailedUnicode(safe_unicode(e))
def setup(self, *args, **kwargs): def setup(self, *args, **kwargs):
'''Setup the environment to use powerline. '''Setup the environment to use powerline.