/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/ui/text.py

Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
39
39
    osutils,
40
40
    trace,
41
41
    )
 
42
from ..sixish import (
 
43
    text_type,
 
44
    )
42
45
from . import (
43
46
    NullProgressView,
44
47
    UIFactory,
304
307
        :param kwargs: Dictionary of arguments to insert into the prompt,
305
308
            to allow UIs to reformat the prompt.
306
309
        """
307
 
        if not isinstance(prompt, unicode):
 
310
        if not isinstance(prompt, text_type):
308
311
            raise ValueError("prompt %r not a unicode string" % prompt)
309
312
        if kwargs:
310
313
            # See <https://launchpad.net/bugs/365891>