Merge pull request #204 from asottile/at_least_one_sep

Have at least one separator in sep()
pytest-dev · Nov 23, 2018 · b9da2ed · b9da2ed
2 parents 0b562ce + a499409
commit b9da2ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/py/_io/terminalwriter.py b/py/_io/terminalwriter.py
@@ -227,7 +227,7 @@ def sep(self, sepchar, title=None, fullwidth=None, **kw):
             # i.e.    2 + 2*len(sepchar)*N + len(title) <= fullwidth
             #         2*len(sepchar)*N <= fullwidth - len(title) - 2
             #         N <= (fullwidth - len(title) - 2) // (2*len(sepchar))
-            N = (fullwidth - len(title) - 2) // (2*len(sepchar))
+            N = max((fullwidth - len(title) - 2) // (2*len(sepchar)), 1)
             fill = sepchar * N
             line = "%s %s %s" % (fill, title, fill)
         else:

diff --git a/testing/io_/test_terminalwriter.py b/testing/io_/test_terminalwriter.py
@@ -165,6 +165,12 @@ def test_sep_with_title(self, tw):
         assert len(l) == 1
         assert l[0] == "-" * 26 + " hello " + "-" * (27-win32) + "\n"
 
+    def test_sep_longer_than_width(self, tw):
+        tw.sep('-', 'a' * 10, fullwidth=5)
+        line, = tw.getlines()
+        # even though the string is wider than the line, still have a separator
+        assert line == '- aaaaaaaaaa -\n'
+
     @py.test.mark.skipif("sys.platform == 'win32'")
     def test__escaped(self, tw):
         text2 = tw._escaped("hello", (31))