Merged in andrewgaul/python-tabulate/colalign (pull request astanin#51)

Andrew Gaul · astanin · commit c4d2e2c7e15f · 2018-06-06T13:49:16.000Z
Rename alignfmt to colalign
diff --git a/README.rst b/README.rst
@@ -421,12 +421,12 @@ Custom column alignment
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 ``tabulate`` allows a custom column alignment to override the above.  The
-``alignfmt`` argument can be a list or a tuple of ``stralign`` named arguments.
+``colalign`` argument can be a list or a tuple of ``stralign`` named arguments.
 Possible column alignments are: ``right``, ``center``, ``left``, ``decimal``
 (only for numbers), and ``None`` (to disable alignment).  Omitting an alignment
 uses the default.  For example::
 
-    >>> print(tabulate([["one", "two"], ["three", "four"]], alignfmt=("right",))
+    >>> print(tabulate([["one", "two"], ["three", "four"]], colalign=("right",))
     -----  ----
       one  two
     three  four
diff --git a/tabulate.py b/tabulate.py
@@ -960,7 +960,7 @@ def _normalize_tabular_data(tabular_data, headers, showindex="default"):
 def tabulate(tabular_data, headers=(), tablefmt="simple",
              floatfmt=_DEFAULT_FLOATFMT, numalign="decimal", stralign="left",
              missingval=_DEFAULT_MISSINGVAL, showindex="default", disable_numparse=False,
-             alignfmt=None):
+             colalign=None):
     """Format a fixed width table for pretty printing.
 
     >>> print(tabulate([[1, 2.34], [-56, "8.999"], ["2", "10001"]]))
@@ -1289,9 +1289,9 @@ def tabulate(tabular_data, headers=(), tablefmt="simple",
 
     # align columns
     aligns = [numalign if ct in [int,float] else stralign for ct in coltypes]
-    if alignfmt is not None:
-        assert isinstance(alignfmt, Iterable)
-        for idx, align in enumerate(alignfmt):
+    if colalign is not None:
+        assert isinstance(colalign, Iterable)
+        for idx, align in enumerate(colalign):
             aligns[idx] = align
     minwidths = [width_fn(h) + MIN_PADDING for h in headers] if headers else [0]*len(cols)
     cols = [_align_column(c, a, minw, has_invisible, enable_widechars, is_multiline)
@@ -1476,7 +1476,7 @@ def _main():
         sys.exit(2)
     headers = []
     floatfmt = _DEFAULT_FLOATFMT
-    alignfmt = None
+    colalign = None
     tablefmt = "simple"
     sep = r"\s+"
     outfile = "-"
@@ -1487,8 +1487,8 @@ def _main():
             outfile = value
         elif opt in ["-F", "--float"]:
             floatfmt = value
-        elif opt in ["-A", "--align"]:
-            alignfmt = value.split()
+        elif opt in ["-C", "--colalign"]:
+            colalign = value.split()
         elif opt in ["-f", "--format"]:
             if value not in tabulate_formats:
                 print("%s is not a supported table format" % value)
@@ -1508,19 +1508,19 @@ def _main():
             if _is_file(f):
                 _pprint_file(f, headers=headers, tablefmt=tablefmt,
                              sep=sep, floatfmt=floatfmt, file=out,
-                             alignfmt=alignfmt)
+                             colalign=colalign)
             else:
                 with open(f) as fobj:
                     _pprint_file(fobj, headers=headers, tablefmt=tablefmt,
                                  sep=sep, floatfmt=floatfmt, file=out,
-                                 alignfmt=alignfmt)
+                                 colalign=colalign)
 
 
-def _pprint_file(fobject, headers, tablefmt, sep, floatfmt, file, alignfmt):
+def _pprint_file(fobject, headers, tablefmt, sep, floatfmt, file, colalign):
     rows = fobject.readlines()
     table = [re.split(sep, r.rstrip()) for r in rows if r.strip()]
     print(tabulate(table, headers, tablefmt, floatfmt=floatfmt,
-          alignfmt=alignfmt), file=file)
+          colalign=colalign), file=file)
 
 
 if __name__ == "__main__":
diff --git a/test/test_output.py b/test/test_output.py
@@ -936,9 +936,9 @@ def test_floatfmt_multi():
     expected = '0.1  0.123  0.12345'
     assert_equal(expected, result)
 
-def test_alignfmt_multi():
-    "Output: string columns with custom alignfmt"
-    result = tabulate([["one", "two"], ["three", "four"]], alignfmt=("right",), tablefmt="plain")
+def test_colalign_multi():
+    "Output: string columns with custom colalign"
+    result = tabulate([["one", "two"], ["three", "four"]], colalign=("right",), tablefmt="plain")
     expected = '  one  two\nthree  four'
     assert_equal(expected, result)
 
