/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/version.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/version.py
30
30
    osutils,
31
31
    trace,
32
32
    )
 
33
from .sixish import text_type
33
34
 
34
35
 
35
36
def show_version(show_config=True, show_copyright=True, to_file=None):
70
71
    to_file.write("  Python standard library:" + ' ')
71
72
    to_file.write(os.path.dirname(os.__file__) + '\n')
72
73
    platform_str = platform.platform(aliased=1)
73
 
    if not isinstance(platform_str, str):
 
74
    if not isinstance(platform_str, text_type):
74
75
        platform_str = platform_str.decode('utf-8')
75
76
    to_file.write("  Platform: %s\n" % platform_str)
76
77
    to_file.write("  breezy: ")
83
84
    if show_config:
84
85
        config_dir = osutils.normpath(
85
86
            bedding.config_dir())  # use native slashes
86
 
        if not isinstance(config_dir, str):
 
87
        if not isinstance(config_dir, text_type):
87
88
            config_dir = config_dir.decode(osutils.get_user_encoding())
88
89
        to_file.write("  Breezy configuration: %s\n" % (config_dir,))
89
90
        to_file.write("  Breezy log file: ")