/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/ui/text.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-05-06 03:06:18 UTC
  • mfrom: (7500.1.2 trunk-merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200506030618-131sjbc876q7on66
Merge the 3.1 branch.

Merged from https://code.launchpad.net/~jelmer/brz/trunk-merge-3.1/+merge/383481

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/ui/text.py
16
16
 
17
17
"""Text UI, write output to the console."""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
19
import codecs
22
20
import io
23
21
import os
40
38
    osutils,
41
39
    trace,
42
40
    )
43
 
from ..sixish import (
44
 
    text_type,
45
 
    )
46
41
from . import (
47
42
    NullProgressView,
48
43
    UIFactory,
325
320
        :param kwargs: Dictionary of arguments to insert into the prompt,
326
321
            to allow UIs to reformat the prompt.
327
322
        """
328
 
        if not isinstance(prompt, text_type):
 
323
        if not isinstance(prompt, str):
329
324
            raise ValueError("prompt %r not a unicode string" % prompt)
330
325
        if kwargs:
331
326
            # See <https://launchpad.net/bugs/365891>