[py-svn] py-trunk commit f2c33cd6aba7: fix check to work when there is no jython

commits-noreply at bitbucket.org commits-noreply at bitbucket.org
Tue Apr 20 19:49:51 CEST 2010


# HG changeset patch -- Bitbucket.org
# Project py-trunk
# URL http://bitbucket.org/hpk42/py-trunk/overview
# User holger krekel <holger at merlinux.eu>
# Date 1271785729 25200
# Node ID f2c33cd6aba71e1d50e877c4fcaab7b6cb48e2d3
# Parent  5e0646b82f031ebdfc6e947129e8e978d1a988fe
fix check to work when there is no jython

--- a/py/_io/terminalwriter.py
+++ b/py/_io/terminalwriter.py
@@ -134,7 +134,7 @@ def ansi_print(text, esc, file=None, new
 def should_do_markup(file):
     return hasattr(file, 'isatty') and file.isatty() \
            and os.environ.get('TERM') != 'dumb' \
-           and not (os._name == 'nt' and sys.platform.startswith('java'))
+           and not (sys.platform.startswith('java') and os._name == 'nt')
 
 class TerminalWriter(object):
     _esctable = dict(black=30, red=31, green=32, yellow=33,



More information about the pytest-commit mailing list