PyPy and bzr

[INADA Naoki]

PyPy is very interesting project for Pythonista.
I'm enjoying with pypy-1.5.1.

One thing I found is bzr doesn't expects pypy's version_info.

$ ~/pypy-c-jit-43780-b590cf6de419-linux64/bin/pypy -c "import sys;
print sys.version_info"
(major=2, minor=7, micro=1, releaselevel='final', serial=42)
$ ~/pypy-c-jit-43780-b590cf6de419-linux64/bin/pypy ./bzr version -v
...
  File "/home/inada-n/work/bzr2/bzr/bzrlib/__init__.py", line 118, in
_format_version_tuple
    raise ValueError("version_info %r not valid" % (version_info,))
ValueError: version_info (major=2, minor=7, micro=1,
releaselevel='final', serial=42) not valid

I've modified _format_version_tuple and bzr mostly works with pypy.

=== modified file 'bzrlib/__init__.py'
--- bzrlib/__init__.py  2011-04-28 14:12:08 +0000
+++ bzrlib/__init__.py  2011-05-11 18:06:46 +0000
@@ -101,7 +101,7 @@
     sub = version_info[4]

     # check they're consistent
-    if release_type == 'final' and sub == 0:
+    if release_type == 'final':
         sub_string = ''
     elif release_type == 'dev' and sub == 0:
         sub_string = 'dev'

Is this patch acceptable?
--
INADA Naoki  <songofacandy at gmail.com>