tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'non-unicode-errors' into develop

This commit is contained in:
ZyX 2014-08-29 21:06:06 +04:00
parent d455cec319 d138c94704
commit c5d15ac8a8
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
powerline/__init__.py
View File

@ -67,9 +67,15 @@ class PowerlineLogger(object):
def _log(self, attr, msg, *args, **kwargs): def _log(self, attr, msg, *args, **kwargs):
prefix = kwargs.get('prefix') or self.prefix prefix = kwargs.get('prefix') or self.prefix
prefix = self.ext + ((':' + prefix) if prefix else '') prefix = self.ext + ((':' + prefix) if prefix else '')
msg = safe_unicode(msg)
if args or kwargs: if args or kwargs:
args = [safe_unicode(s) if isinstance(s, bytes) else s for s in args]
kwargs = dict((
(k, safe_unicode(v) if isinstance(v, bytes) else v)
for k, v in kwargs.items()
))
msg = msg.format(*args, **kwargs) msg = msg.format(*args, **kwargs)
msg = prefix + ':' + safe_unicode(msg) msg = prefix + ':' + msg
key = attr + ':' + prefix key = attr + ':' + prefix
if msg != self.last_msgs.get(key): if msg != self.last_msgs.get(key):
getattr(self.logger, attr)(msg) getattr(self.logger, attr)(msg)