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
This commit is contained in:
parent
a75e58be58
commit
7fbebae8c8
|
@ -6,10 +6,22 @@ import sys
|
||||||
|
|
||||||
from django.utils import termcolors
|
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():
|
def color_style():
|
||||||
"""Returns a Style object with the Django color scheme."""
|
"""Returns a Style object with the Django color scheme."""
|
||||||
if (sys.platform == 'win32' or sys.platform == 'Pocket PC'
|
if not supports_color():
|
||||||
or sys.platform.startswith('java') or not sys.stdout.isatty()):
|
|
||||||
return no_style()
|
return no_style()
|
||||||
class dummy: pass
|
class dummy: pass
|
||||||
style = dummy()
|
style = dummy()
|
||||||
|
|
Loading…
Reference in New Issue