/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-02-03 23:21:15 UTC
  • mfrom: (7290.42.6 paramiko-compat)
  • Revision ID: breezy.the.bot@gmail.com-20200203232115-g7k11bhsfeiqcprv
Fix compatibility with newer versions of paramiko, which break on noise before keys in pem files.

Merged from https://code.launchpad.net/~jelmer/brz/paramiko-compat/+merge/378480

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/ui/text.py
40
40
    osutils,
41
41
    trace,
42
42
    )
 
43
from ..sixish import (
 
44
    text_type,
 
45
    )
43
46
from . import (
44
47
    NullProgressView,
45
48
    UIFactory,
322
325
        :param kwargs: Dictionary of arguments to insert into the prompt,
323
326
            to allow UIs to reformat the prompt.
324
327
        """
325
 
        if not isinstance(prompt, str):
 
328
        if not isinstance(prompt, text_type):
326
329
            raise ValueError("prompt %r not a unicode string" % prompt)
327
330
        if kwargs:
328
331
            # See <https://launchpad.net/bugs/365891>