← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/version.py

  • Committer: Aaron Bentley
  • Date: 2007-12-09 23:53:50 UTC
  • mto: This revision was merged to the branch mainline in revision 3133.
  • Revision ID: aaron.bentley@utoronto.ca-20071209235350-qp39yk0xzx7a4f6p
Don't use the base if not cherrypicking

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/version.py
57
57
        python_dll = "python%d%d.dll" % sys.version_info[:2]
58
58
        to_file.write(os.path.join(basedir, python_dll) + ' ')
59
59
    # and now version of python interpreter
60
 
    to_file.write(bzrlib._format_version_tuple(sys.version_info))
 
60
    to_file.write('.'.join(map(str, sys.version_info)))
61
61
    to_file.write('\n')
62
62
 
63
63
    to_file.write("  Python standard library:" + ' ')
72
72
    if show_config:
73
73
        config_dir = os.path.normpath(config.config_dir())  # use native slashes
74
74
        if not isinstance(config_dir, unicode):
75
 
            config_dir = config_dir.decode(osutils.get_user_encoding())
 
75
            config_dir = config_dir.decode(bzrlib.user_encoding)
76
76
        to_file.write("  Bazaar configuration: %s\n" % (config_dir,))
77
77
        to_file.write("  Bazaar log file: ")
78
78
        to_file.write(trace._bzr_log_filename + '\n')