Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 2084f3fb1 -> 22099adda
Cleanup whitespace for cqlsh PEP8 compliance patch by philipthompson; reviewed by Stefania for CASSANDRA-10455 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/22099add Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22099add Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/22099add Branch: refs/heads/cassandra-3.0 Commit: 22099addaf6029656f8927ffb894c86c73bfaceb Parents: 2084f3f Author: Philip Thompson <ptnapol...@gmail.com> Authored: Tue Oct 6 15:30:26 2015 -0400 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Oct 7 10:20:52 2015 +0200 ---------------------------------------------------------------------- bin/cqlsh.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/22099add/bin/cqlsh.py ---------------------------------------------------------------------- diff --git a/bin/cqlsh.py b/bin/cqlsh.py index 46210da..56b709f 100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@ -2554,9 +2554,10 @@ class SwitchCommand(object): print 'Disabled %s.' % (self.description,) return False + class SwitchCommandWithValue(SwitchCommand): """The same as SwitchCommand except it also accepts a value in place of ON. - + This returns a tuple of the form: (SWITCH_VALUE, PASSED_VALUE) eg: PAGING 50 returns (True, 50) PAGING OFF returns (False, None) @@ -2567,7 +2568,7 @@ class SwitchCommandWithValue(SwitchCommand): def __init__(self, command, desc, value_type=int): SwitchCommand.__init__(self, command, desc) self.value_type = value_type - + def execute(self, state, parsed, printerr): binary_switch_value = SwitchCommand.execute(self, state, parsed, printerr) switch = parsed.get_binding('switch') @@ -2578,6 +2579,7 @@ class SwitchCommandWithValue(SwitchCommand): value = None return (binary_switch_value, value) + def option_with_default(cparser_getter, section, option, default=None): try: return cparser_getter(section, option)