Merge pull request #11 from nschloe/strip-fix

Strip fix

Author: nschloe

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2019 Nico Schlömer
+Copyright (c) 2018-2020 Nico Schlömer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

codecov.yml

@@ -4,3 +4,4 @@ codecov:
   disable_default_path_fixes: true
 fixes:
   - ".*/dist-packages/::"
+  - ".*/site-packages/::"

setup.py

@@ -13,9 +13,14 @@
     version=about["__version__"],
     packages=find_packages(),
     url="https://github.com/nschloe/tablign",
+    project_urls={
+        "Code": "https://github.com/nschloe/tablign",
+        "Issue tracker": "https://github.com/nschloe/tablign/issues",
+    },
     author=about["__author__"],
     author_email=about["__author_email__"],
     install_requires=[],
+    python_requires=">=3.6",
     description="Align columns in ASCII tables",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",

tablign/__about__.py

@@ -1,7 +1,7 @@
-__version__ = "0.2.1"
+__version__ = "0.2.2"
 __author__ = "Nico Schlömer"
 __author_email__ = "[email protected]"
-__copyright__ = "Copyright (c) 2018-2019, {} <{}>".format(__author__, __author_email__)
+__copyright__ = f"Copyright (c) 2018-2020, {__author__} <{__author_email__}>"
 __website__ = "https://github.com/nschloe/tablign"
 __license__ = "License :: OSI Approved :: MIT License"
 __status__ = "Development Status :: 4 - Beta"

tablign/main.py

@@ -68,9 +68,13 @@ def tablign(string, align_char=".", delimiter=None):
     # transpose back
     data = list(map(list, zip(*cols)))
 
-    sep = " {} ".format(delimiter) if delimiter else " "
+    sep = f" {delimiter} " if delimiter else " "
 
-    # Only strip trailing whitespace if the delimiter is None.
-    strp = str.rstrip if delimiter is None else str.strip
+    first_col_empty = all(s == "" for s in cols[0])
+    last_col_empty = all(s == "" for s in cols[-1])
 
-    return "\n".join([strp(sep.join(row)) for row in data])
+    # If the delimiter is None, only strip trailing whitespace
+    lstrp = str.lstrip if first_col_empty and delimiter is not None else lambda x: x
+    rstrp = str.rstrip if last_col_empty and delimiter is not None else lambda x: x
+
+    return "\n".join([rstrp(lstrp(sep.join(row))) for row in data])

test/test_cli.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 import tempfile
 
 import tablign
@@ -17,4 +15,3 @@ def test_cli():
     ref = """A     1.34  -214.1\nCCCC 55.534 1131.1"""
     with open(outfile, "r") as f:
         assert ref == f.read()
-    return

test/test_tablign.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 import pytest
 
 import tablign
@@ -9,7 +7,6 @@ def test_plain():
     data = """A  1.34  -214.1\nCCCC 55.534 1131.1"""
     ref = """A     1.34  -214.1\nCCCC 55.534 1131.1"""
     assert tablign.tablign(data) == ref
-    return
 
 
 @pytest.mark.parametrize("sep_char", [","])
@@ -22,30 +19,32 @@ def test_column_seps(sep_char):
 CCCC {} 55.534 {} 1131.1""".format(
         *(4 * sep_char)
     )
-
     assert tablign.tablign(data) == ref
-    return
 
 
 def test_empty_cell():
-    data = """| A   |  B |\n||C|"""
-    ref = """| A | B |\n|   | C |"""
+    data = "| A   |  B |\n||C|"
+    ref = "| A | B |\n|   | C |"
+    print("repr", repr(tablign.tablign(data)))
     assert tablign.tablign(data) == ref
-    return
 
 
 def test_different_column_lengths():
-    data = """| A   |  B |\n|C|"""
-    ref = """| A | B |\n| C |   |"""
+    data = "| A   |  B |\n|C|"
+    ref = "| A | B |\n| C |   |"
     assert tablign.tablign(data) == ref
-    return
 
 
 def test_csv():
     data = """A,B,\nCCCC,,"""
     ref = """A    , B ,\nCCCC ,   ,"""
     assert tablign.tablign(data) == ref
-    return
+
+
+def test_first_column_missing():
+    data = "A,B,Z\n      ,C,Z"
+    ref = "A , B , Z\n  , C , Z"
+    assert tablign.tablign(data) == ref
 
 
 if __name__ == "__main__":