← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/version.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/version.py
16
16
 
17
17
"""Report on version of bzrlib"""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
import os
 
22
import platform
20
23
import sys
21
24
 
22
25
import bzrlib
23
26
from bzrlib import (
24
 
    bzrdir,
25
27
    config,
 
28
    controldir,
26
29
    errors,
27
30
    osutils,
28
31
    trace,
30
33
 
31
34
 
32
35
def show_version(show_config=True, show_copyright=True, to_file=None):
33
 
    import platform
34
 
 
35
36
    if to_file is None:
36
37
        to_file = sys.stdout
37
38
    to_file.write("Bazaar (bzr) %s\n" % bzrlib.__version__)
64
65
 
65
66
    to_file.write("  Python standard library:" + ' ')
66
67
    to_file.write(os.path.dirname(os.__file__) + '\n')
67
 
    to_file.write("  Platform: %s\n" % platform.platform(aliased=1))
 
68
    to_file.write("  Platform: %s\n"
 
69
                  % platform.platform(aliased=1).decode('utf-8'))
68
70
    to_file.write("  bzrlib: ")
69
71
    if len(bzrlib.__path__) > 1:
70
72
        # print repr, which is a good enough way of making it clear it's
73
75
    else:
74
76
        to_file.write(bzrlib.__path__[0] + '\n')
75
77
    if show_config:
76
 
        config_dir = os.path.normpath(config.config_dir())  # use native slashes
 
78
        config_dir = osutils.normpath(config.config_dir())  # use native slashes
77
79
        if not isinstance(config_dir, unicode):
78
80
            config_dir = config_dir.decode(osutils.get_user_encoding())
79
81
        to_file.write("  Bazaar configuration: %s\n" % (config_dir,))
98
100
    If bzr is not being run from its working tree, returns None.
99
101
    """
100
102
    try:
101
 
        control = bzrdir.BzrDir.open_containing(__file__)[0]
 
103
        control = controldir.ControlDir.open_containing(__file__)[0]
102
104
        return control.open_workingtree(recommend_upgrade=False)
103
105
    except (errors.NotBranchError, errors.UnknownFormatError,
104
106
            errors.NoWorkingTree):