natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cqlsh: allow disabling colors. 

Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-4634
This commit is contained in:
Brandon Williams 2012-09-10 14:40:45 -05:00
parent aba5a37650
commit 7cbc0be23d
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/cqlsh
View File

@ -121,8 +121,10 @@ precedence over any defaults.""" % globals()
parser = optparse.OptionParser(description=description, epilog=epilog,
usage="Usage: %prog [options] [host [port]]",
version='cqlsh ' + version)
parser.add_option("-C", "--color", action="store_true",
help="Enable color output.")
parser.add_option("-C", "--color", action='store_true', dest='color',
help='Always use color output')
parser.add_option("--no-color", action='store_false', dest='color',
help='Never use color output')
parser.add_option("-u", "--username", help="Authenticate as user.")
parser.add_option("-p", "--password", help="Authenticate using password.")
parser.add_option('-k', '--keyspace', help='Authenticate to the given keyspace.')
@ -2598,9 +2600,6 @@ def read_options(cmdlineargs, environment):
optvalues.keyspace = option_with_default(configs.get, 'authentication', 'keyspace')
optvalues.completekey = option_with_default(configs.get, 'ui', 'completekey', 'tab')
optvalues.color = option_with_default(configs.getboolean, 'ui', 'color')
if optvalues.color is None:
# default yes if tty
optvalues.color = should_use_color()
optvalues.debug = False
optvalues.file = None
optvalues.tty = sys.stdin.isatty()
@ -2620,9 +2619,16 @@ def read_options(cmdlineargs, environment):
port = arguments[1]
if options.file is not None:
options.color = False
options.tty = False
if optvalues.color in (True, False):
options.color = optvalues.color
else:
if options.file is not None:
options.color = False
else:
options.color = should_use_color()
options.cqlversion, cqlvertup = full_cql_version(options.cqlversion)
if cqlvertup[0] < 3:
options.cqlmodule = cqlhandling