added test for ap() and made changes re Travis CI

Author: chrispycheng

nibabel/cmdline/tests/test_utils.py

@@ -19,3 +19,11 @@ def test_table2string():
     assert_equal(table2string([["Let's", "Make", "Tests", "And"], ["Have", "Lots", "Of", "Fun"],
                                ["With", "Python", "Guys", "!"]]), "Let's  Make  Tests And\n Have  Lots    Of  Fun"+
                                                                   "\n With Python  Guys  !\n")
+
+
+def test_ap():
+    assert_equal(ap([1, 2], "%2d"), "  1,  2")
+    assert_equal(ap([1, 2], "%3d"), "   1,   2")
+    assert_equal(ap([1, 2], "%-2d"), "1  , 2  ")
+    assert_equal(ap([1, 2], "%d", "+"), "1+2")
+    assert_equal(ap([1, 2, 3], "%d", "-"), "1-2-3")

nibabel/cmdline/utils.py

@@ -108,11 +108,11 @@ def table2string(table, out=None):
         return value
 
 
-def ap(l, format_, sep=', '):
+def ap(helplist, format_, sep=', '):
     """Little helper to enforce consistency"""
-    if l == '-':
-        return l
-    ls = [format_ % x for x in l]
+    if helplist == '-':
+        return helplist
+    ls = [format_ % x for x in helplist]
     return sep.join(ls)
 
 
@@ -124,4 +124,4 @@ def safe_get(obj, name):
         return f()
     except Exception as e:
         verbose(2, "get_%s() failed -- %s" % (name, e))
-        return '-'
+        return '-'