util, minirst: do not crash with COLUMNS=0

This commit is contained in:
Martin Geisler 2009-09-03 21:07:06 +02:00
parent 68e9caf50f
commit 298efc8d54
2 changed files with 5 additions and 0 deletions

View File

@ -279,6 +279,8 @@ def addmargins(blocks):
def formatblock(block, width):
"""Format a block according to width."""
if width <= 0:
width = 78
indent = ' ' * block['indent']
if block['type'] == 'margin':
return ''

View File

@ -1274,6 +1274,9 @@ def termwidth():
def wrap(line, hangindent, width=None):
if width is None:
width = termwidth() - 2
if width <= hangindent:
# adjust for weird terminal size
width = max(78, hangindent + 1)
padding = '\n' + ' ' * hangindent
return padding.join(textwrap.wrap(line, width=width - hangindent))