Fix handling of int lists in SelectorMethods.tokens_to_str(), fix uni…

…t tests for SelectorMethods.collapse().
neurokernel · Feb 17, 2015 · cb07321 · cb07321
1 parent 300af19
commit cb07321
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/neurokernel/plsel.py b/neurokernel/plsel.py
@@ -994,7 +994,7 @@ def tokens_to_str(cls, tokens):
             elif type(t) in [tuple, list]:
                 if not t:
                     raise ValueError('invalid token')
-                result.append('['+','.join(t)+']')
+                result.append('['+','.join(map(str, t))+']')
             else:
                 raise ValueError('invalid token')
         return ''.join(result)

diff --git a/tests/test_plsel.py b/tests/test_plsel.py
@@ -626,10 +626,10 @@ def test_tokens_to_str(self):
 
     def test_collapse(self):
         assert self.sel.collapse([]) == ''
-        assert self.sel.tokens_to_str([['a']]) == '/a'
+        assert self.sel.collapse([['a']]) == '/a'
         assert self.sel.collapse([['a', 0]]) == '/a/0'
         assert self.sel.collapse([('a', 0)]) == '/a/0'
-        assert self.sel.collapse([['a', 'b', 0]]) == '/a/0'
+        assert self.sel.collapse([['a', 'b', 0]]) == '/a/b/0'
         assert self.sel.collapse([['a', 0], ['b', 0]]) == '/a/0,/b/0'
         assert self.sel.collapse([['a', 'b', (0, 1)], ['c', 'd']]) == '/a/b[0,1],/c/d'