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