Rev 3297: (mbp)(trivial) Better formatting of python version number in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3297
revision-id:pqm at pqm.ubuntu.com-20080319032243-u1uwskj36dp0i0hs
parent: pqm at pqm.ubuntu.com-20080318200038-jo7mqokvib9aojt9
parent: mbp at sourcefrog.net-20080319014343-uftcx516win6wqds
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-03-19 03:22:43 +0000
message:
  (mbp)(trivial) Better formatting of python version number
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
  bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
    ------------------------------------------------------------
    revno: 3293.2.2
    revision-id:mbp at sourcefrog.net-20080319014343-uftcx516win6wqds
    parent: mbp at sourcefrog.net-20080319014018-ihd39j2o886xmp15
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: trivial
    timestamp: Wed 2008-03-19 12:43:43 +1100
    message:
      Fix formatting of other occurrences of Python version
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
    ------------------------------------------------------------
    revno: 3293.2.1
    revision-id:mbp at sourcefrog.net-20080319014018-ihd39j2o886xmp15
    parent: pqm at pqm.ubuntu.com-20080318024945-zhs03078h06fbk6l
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: trivial
    timestamp: Wed 2008-03-19 12:40:18 +1100
    message:
      Better formatting of python version in --version
    modified:
      bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2008-03-17 21:58:47 +0000
+++ b/bzrlib/builtins.py	2008-03-19 01:43:43 +0000
@@ -2666,7 +2666,7 @@
             print '   %s (%s python%s)' % (
                     bzrlib.__path__[0],
                     bzrlib.version_string,
-                    '.'.join(map(str, sys.version_info)),
+                    bzrlib._format_version_tuple(sys.version_info),
                     )
         print
         if testspecs_list is not None:

=== modified file 'bzrlib/trace.py'
--- a/bzrlib/trace.py	2008-02-16 10:03:17 +0000
+++ b/bzrlib/trace.py	2008-03-19 01:43:43 +0000
@@ -437,7 +437,7 @@
     err_file.write('\n')
     err_file.write('bzr %s on python %s (%s)\n' % \
                        (bzrlib.__version__,
-                        '.'.join(map(str, sys.version_info)),
+                        bzrlib._format_version_tuple(sys.version_info),
                         sys.platform))
     err_file.write('arguments: %r\n' % sys.argv)
     err_file.write(

=== modified file 'bzrlib/version.py'
--- a/bzrlib/version.py	2007-10-16 17:37:43 +0000
+++ b/bzrlib/version.py	2008-03-19 01:40:18 +0000
@@ -57,7 +57,7 @@
         python_dll = "python%d%d.dll" % sys.version_info[:2]
         to_file.write(os.path.join(basedir, python_dll) + ' ')
     # and now version of python interpreter
-    to_file.write('.'.join(map(str, sys.version_info)))
+    to_file.write(bzrlib._format_version_tuple(sys.version_info))
     to_file.write('\n')
 
     to_file.write("  Python standard library:" + ' ')