Merge branch 'master' into unstable

This commit is contained in:
Julien Duponchelle committed 2015-06-10 16:30:30 +02:00
commit 75267f9d53
4 files changed
+11 -3

No files matched your search

+1 -1
View File
@@ -34,7 +34,7 @@ class ColouredFormatter(logging.Formatter):
message = super().format(record)
if not colour:
if not colour or sys.platform.startswith("win"):
return message.replace("#RESET#", "")
level_no = record.levelno