configure break long words and on hyphen for maxcolwidths

Author: Daniel Aslau

tabulate/__init__.py

@@ -33,6 +33,10 @@ def _is_file(f):
 
 # Whether or not to preserve leading/trailing whitespace in data.
 PRESERVE_WHITESPACE = False
+# TextWrapper breaks words longer than 'width'.
+BREAK_LONG_WORDS = True
+# TextWrapper is breaking hyphenated words.
+BREAK_ON_HYPHENS = True
 
 _DEFAULT_FLOATFMT = "g"
 _DEFAULT_INTFMT = ""
@@ -1524,7 +1528,7 @@ def _wrap_text_to_colwidths(list_of_lists, colwidths, numparses=True):
                 continue
 
             if width is not None:
-                wrapper = _CustomTextWrap(width=width)
+                wrapper = _CustomTextWrap(width=width, break_long_words=BREAK_LONG_WORDS, break_on_hyphens=BREAK_ON_HYPHENS)
                 # Cast based on our internal type handling
                 # Any future custom formatting of types (such as datetimes)
                 # may need to be more explicit than just `str` of the object

test/test_output.py

@@ -2973,3 +2973,36 @@ def test_preserve_whitespace():
     expected = "\n".join(["h1    h2    h3", "----  ----  ----", "foo   bar   foo"])
     result = tabulate(test_table, table_headers)
     assert_equal(expected, result)
+
+def test_break_long_words():
+    "Output: Default table output, with breakwords true."
+    table_headers = ["h1", "h2", "h3"]
+    test_table = [["  foo1", " bar2   ", "foo3"]]
+
+    # Table is not wrapped
+    tabulate_module.BREAK_LONG_WORDS = False
+    expected = "h1    h2    h3\n----  ----  ----\nfoo1  bar2  foo3"
+    result = tabulate(test_table, table_headers, maxcolwidths=3)
+    assert_equal(expected, result)
+
+    # Table is wrapped on 2 letters
+    tabulate_module.BREAK_LONG_WORDS = True
+    expected = "h1    h2    h3\n----  ----  ----\nf     ba    foo\noo1   r2    3"
+    result = tabulate(test_table, table_headers, maxcolwidths=3)
+    assert_equal(expected, result)
+
+def test_break_on_hyphens():
+    "Output: Default table output, with break on hyphens true."
+    tabulate_module.BREAK_ON_HYPHENS = False
+    table_headers = ["h1", "h2", "h3"]
+    test_table = [["  foo-bar", " bar-bar   ", "foo-foo"]]
+    # Table is wrapped on 2 letters
+    expected = "h1    h2    h3\n----  ----  -----\nfoo   bar-  foo-f\n-bar  bar   oo"
+    result = tabulate(test_table, table_headers, maxcolwidths=5)
+    assert_equal(expected, result)
+
+    # Table is no longer wrapped
+    tabulate_module.BREAK_ON_HYPHENS = True
+    expected = "h1    h2    h3\n----  ----  ----\nfoo-  bar-  foo-\nbar   bar   foo"
+    result = tabulate(test_table, table_headers, maxcolwidths=5)
+    assert_equal(expected, result)