summaryrefslogtreecommitdiff
path: root/sphinx/quickstart.py
diff options
context:
space:
mode:
authorgeorg.brandl <devnull@localhost>2008-10-16 21:18:24 +0000
committergeorg.brandl <devnull@localhost>2008-10-16 21:18:24 +0000
commit95ace81e9d2225106410a357a9845157ab2c535c (patch)
tree76731616411bea58b4d310a5e2d8bf4bcac3be0d /sphinx/quickstart.py
parent57b2e34e98ea845422abb244f6efb6e26309e0a4 (diff)
downloadsphinx-95ace81e9d2225106410a357a9845157ab2c535c.tar.gz
Remove the win32 check, should be covered by color_terminal.
Add color_terminal check to quickstart.
Diffstat (limited to 'sphinx/quickstart.py')
-rw-r--r--sphinx/quickstart.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index fd4376bc..03024535 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.')