OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Assume isatty is always defined, and catch AttributeError. Also don't bother checking colour==Normal

pull/4049/head
Erik Johnston 2018-10-17 17:06:49 +01:00
parent 1af16acd4c
commit a5aea15a6b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synctl
View File

@ -50,10 +50,14 @@ def pid_running(pid):
def write(message, colour=NORMAL, stream=sys.stdout): def write(message, colour=NORMAL, stream=sys.stdout):
# Lets check if we're writing to a TTY before colouring # Lets check if we're writing to a TTY before colouring
should_colour = False should_colour = False
if stream in (sys.stdout, sys.stderr): try:
should_colour = stream.isatty() should_colour = stream.isatty()
except AttributeError:
# Just in case `isatty` isn't defined on everything. The python
# docs are incredibly vague.
pass
if not should_colour or colour == NORMAL: if not should_colour:
stream.write(message + "\n") stream.write(message + "\n")
else: else:
stream.write(colour + message + NORMAL + "\n") stream.write(colour + message + NORMAL + "\n")