Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle committed 2016-05-18 11:25:41 +02:00
commit d5895c3a47
22 files changed
+65 -53

No files matched your search

+1 -1
View File
@@ -74,7 +74,7 @@ class ColouredStreamHandler(logging.StreamHandler):
stream.write(msg)
stream.write(self.terminator)
self.flush()
# On OSX when frozen flush raise a BrokenPipeError
# On OSX when frozen flush raise a BrokenPipeError
except BrokenPipeError:
pass
except Exception: