Rev 3727: (mbp) Correct exception expression in _format_version_tuple (Mark in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3727
revision-id: pqm at pqm.ubuntu.com-20080923070920-h74n26u7ipd72c46
parent: pqm at pqm.ubuntu.com-20080923051523-7ghbp6v2i2dehplc
parent: mbp at sourcefrog.net-20080923062957-7mz3esxqf6kzmywz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-09-23 08:09:20 +0100
message:
  (mbp) Correct exception expression in _format_version_tuple (Mark
  	Hammond)
modified:
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 3726.1.1
    revision-id: mbp at sourcefrog.net-20080923062957-7mz3esxqf6kzmywz
    parent: pqm at pqm.ubuntu.com-20080923051523-7ghbp6v2i2dehplc
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: trivial
    timestamp: Tue 2008-09-23 16:29:57 +1000
    message:
      Correct exception expression in _format_version_tuple (Mark Hammond)
    modified:
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2008-09-17 07:18:20 +0000
+++ b/bzrlib/__init__.py	2008-09-23 06:29:57 +0000
@@ -65,6 +65,10 @@
     1.1.1rc2
     >>> print _format_version_tuple((1, 4, 0))
     1.4
+    >>> print _format_version_tuple((1, 4, 0, 'wibble', 0))
+    Traceback (most recent call last):
+    ...
+    ValueError: version_info (1, 4, 0, 'wibble', 0) not valid
     """
     if version_info[2] == 0:
         main_version = '%d.%d' % version_info[:2]
@@ -86,7 +90,7 @@
     elif __release_type == 'candidate' and __sub != 0:
         __sub_string = 'rc' + str(__sub)
     else:
-        raise AssertionError("version_info %r not valid" % version_info)
+        raise ValueError("version_info %r not valid" % (version_info,))
 
     version_string = '%d.%d.%d.%s.%d' % version_info
     return main_version + __sub_string