revno generated as a string, now breaking %(revno)d

[Shawn Sherwood]

With Ubuntu 12.04 and PyYAML, I'm getting errors building the distutils due to casting problems:

This is from currently generated core/lib/_version.py (made by "bzr version-info --format python:

version_info = {'branch_nick': u'1.10',
 'build_date': '2012-05-26 23:14:43 -0700',
 'clean': None,
 'date': '2011-09-20 08:42:57 -0700',
 'revision_id': 'shawn.sherwood@peacemaker-20110920154257-8ku7p1t4sfc6u3gv',
 'revno': '796'}

Now revno is coming in as a string.

Changes like this to a few files fixed this for bzr 2.5.0 (Ubuntu 12.04 default)

-VERSION = str("%(branch_nick)s-%(revno)d" % version_info)
+VERSION = str("%(branch_nick)s-%(revno)s" % version_info)

allowed me to continue. Using a %s shouldn't hurt anythin for older version of bzr.