From 5f6352541b89f75eac08b48e8e37d28c7070726a Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Thu, 16 Oct 2008 21:18:24 +0000 Subject: [PATCH] Remove the win32 check, should be covered by color_terminal. Add color_terminal check to quickstart. --- sphinx/__init__.py | 2 +- sphinx/quickstart.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sphinx/__init__.py b/sphinx/__init__.py index b31a6a52f..a49ed633b 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -54,7 +54,7 @@ def main(argv=sys.argv): from sphinx.application import Sphinx, SphinxError from docutils.utils import SystemMessage - if not sys.stdout.isatty() or sys.platform == 'win32' or not color_terminal(): + if not sys.stdout.isatty() or not color_terminal(): # Windows' poor cmd box doesn't understand ANSI sequences nocolor() diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py index fd4376bca..030245355 100644 --- a/sphinx/quickstart.py +++ b/sphinx/quickstart.py @@ -15,7 +15,7 @@ from os import path TERM_ENCODING = getattr(sys.stdin, 'encoding', None) from sphinx.util import make_filename -from sphinx.util.console import purple, bold, red, turquoise, nocolor +from sphinx.util.console import purple, bold, red, turquoise, nocolor, color_terminal from sphinx.util.texescape import tex_escape_map @@ -380,7 +380,7 @@ def do_prompt(d, key, text, default=None, validator=nonempty): def inner_main(args): d = {} - if os.name == 'nt' or not sys.stdout.isatty(): + if not sys.stdout.isatty() or not color_terminal(): nocolor() print bold('Welcome to the Sphinx quickstart utility.')