comparison tests/test-minirst.py @ 39310:a2a5d4ad5276

minirst: make format() simply return a formatted text

It's a source of bugs to change the type of the return value conditionally.

39309:0a766cb1092a

from mercurial.utils import (
    stringutil,
)

def debugformat(text, form, **kwargs):
    if form == b'html':
        print("html format:")
        out = minirst.format(text, style=form, **kwargs)
    else:
        print("%d column format:" % form)
        out = minirst.format(text, width=form, **kwargs)

    print("-" * 70)
    if type(out) == tuple:
        print(out[0][:-1].decode('utf8'))
        print("-" * 70)
        print(stringutil.pprint(out[1]).decode('utf8'))
    else:
        print(out[:-1].decode('utf8'))
    print("-" * 70)
    print()

def debugformats(title, text, **kwargs):
    print("== %s ==" % title)

39310:a2a5d4ad5276

from mercurial.utils import (
    stringutil,
)

def debugformat(text, form, **kwargs):
    blocks, pruned = minirst.parse(text, **kwargs)
    if form == b'html':
        print("html format:")
        out = minirst.format(text, style=form, **kwargs)
    else:
        print("%d column format:" % form)
        out = minirst.format(text, width=form, **kwargs)

    print("-" * 70)
    print(out[:-1].decode('utf8'))
    if kwargs.get('keep'):
        print("-" * 70)
        print(stringutil.pprint(pruned).decode('utf8'))
    print("-" * 70)
    print()

def debugformats(title, text, **kwargs):
    print("== %s ==" % title)