/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

Support user.signingkey configuration variable in .git/config.

Merged from https://code.launchpad.net/~jelmer/brz/local-git-key/+merge/381000

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
 
19
21
import codecs
20
22
import io
21
23
import os
38
40
    osutils,
39
41
    trace,
40
42
    )
 
43
from ..sixish import (
 
44
    text_type,
 
45
    )
41
46
from . import (
42
47
    NullProgressView,
43
48
    UIFactory,
320
325
        :param kwargs: Dictionary of arguments to insert into the prompt,
321
326
            to allow UIs to reformat the prompt.
322
327
        """
323
 
        if not isinstance(prompt, str):
 
328
        if not isinstance(prompt, text_type):
324
329
            raise ValueError("prompt %r not a unicode string" % prompt)
325
330
        if kwargs:
326
331
            # See <https://launchpad.net/bugs/365891>