[03/10] git commit: Completer shall always return a collection

[mi...@apache.org]

Completer shall always return a collection


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dceca93b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dceca93b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dceca93b

Branch: refs/heads/cassandra-2.1
Commit: dceca93b79654d8b4aa5c26580778a053c5a4862
Parents: b684937
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri Feb 21 15:38:49 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Feb 21 15:38:49 2014 -0800

----------------------------------------------------------------------
 pylib/cqlshlib/cql3handling.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dceca93b/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index b9265fd..50e2015 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -908,7 +908,7 @@ def update_countername_completer(ctxt, cass):
     cqltype = layout.get_column(curcol).cqltype
     coltype = cqltype.typename
     if coltype == 'counter':
-        return maybe_escape_name(curcol)
+        return [maybe_escape_name(curcol)]
     if coltype in ('map', 'set'):
         return ["{"]
     if coltype == 'list':
@@ -926,7 +926,7 @@ def update_counter_inc_completer(ctxt, cass):
     layout = get_cf_layout(ctxt, cass)
     curcol = dequote_name(ctxt.get_binding('updatecol', ''))
     if layout.is_counter_col(curcol):
-        return Hint('<wholenumber>')
+        return [Hint('<wholenumber>')]
     return []
 
 @completer_for('assignment', 'listadder')
@@ -934,6 +934,7 @@ def update_listadder_completer(ctxt, cass):
     rhs = ctxt.get_binding('update_rhs')
     if rhs.startswith('['):
         return ['+']
+    return []
 
 @completer_for('assignment', 'listcol')
 def update_listcol_completer(ctxt, cass):