From 7fbebae8c8797fa7452466055b53c42d6b123811 Mon Sep 17 00:00:00 2001 From: Gary Wilson Jr Date: Sat, 8 Mar 2008 03:12:27 +0000 Subject: [PATCH] Fixed #6223 -- When determining if terminal supports color, don't call `isatty` if it doesn't exist, thanks mamadou. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7202 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/management/color.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/django/core/management/color.py b/django/core/management/color.py index 40fd4e7fdd..337e0f2e68 100644 --- a/django/core/management/color.py +++ b/django/core/management/color.py @@ -6,10 +6,22 @@ import sys from django.utils import termcolors +def supports_color(): + """ + Returns True if the running system's terminal supports color, and False + otherwise. + """ + unsupported_platform = (sys.platform in ('win32', 'Pocket PC') + or sys.platform.startswith('java')) + # isatty is not always implemented, #6223. + is_a_tty = hasattr(sys.stdout, 'isatty') and sys.stdout.isatty() + if unsupported_platform or not is_a_tty: + return False + return True + def color_style(): """Returns a Style object with the Django color scheme.""" - if (sys.platform == 'win32' or sys.platform == 'Pocket PC' - or sys.platform.startswith('java') or not sys.stdout.isatty()): + if not supports_color(): return no_style() class dummy: pass style = dummy()