FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix for extra lines in windows logs - Issue 1715

This commit is contained in:
Thomas Nagy 2016-03-18 19:32:10 +01:00
parent 1fb3645493
commit 7960f19cb1
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
waflib/Logs.py
View File

@ -169,7 +169,7 @@ class log_handler(logging.StreamHandler):
else: else:
stream.write(fs % msg) stream.write(fs % msg)
except UnicodeError: except UnicodeError:
stream.write((fs % msg).encode("UTF-8")) stream.write((fs % msg).encode('utf-8'))
else: else:
logging.StreamHandler.emit(self, record) logging.StreamHandler.emit(self, record)
@ -200,8 +200,9 @@ class formatter(logging.Formatter):
c2 = getattr(rec, 'c2', colors.NORMAL) c2 = getattr(rec, 'c2', colors.NORMAL)
msg = '%s%s%s' % (c1, msg, c2) msg = '%s%s%s' % (c1, msg, c2)
else: else:
msg = msg.replace('\r', '\n') # remove single \r that make long lines in text files
msg = re.sub(r'\x1B\[(K|.*?(m|h|l))', '', msg) # and other terminal commands
msg = re.sub(r'\r(?!\n)|\x1B\[(K|.*?(m|h|l))', '', msg)
if rec.levelno >= logging.INFO: # ?? if rec.levelno >= logging.INFO: # ??
return msg return msg