/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2008-09-26 22:08:38 UTC
  • mfrom: (3744 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3745.
  • Revision ID: john@arbash-meinel.com-20080926220838-e05btynnn08m3qf5
Merge bzr.dev, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/__init__.py
65
65
    1.1.1rc2
66
66
    >>> print _format_version_tuple((1, 4, 0))
67
67
    1.4
 
68
    >>> print _format_version_tuple((1, 4, 0, 'wibble', 0))
 
69
    Traceback (most recent call last):
 
70
    ...
 
71
    ValueError: version_info (1, 4, 0, 'wibble', 0) not valid
68
72
    """
69
73
    if version_info[2] == 0:
70
74
        main_version = '%d.%d' % version_info[:2]
86
90
    elif __release_type == 'candidate' and __sub != 0:
87
91
        __sub_string = 'rc' + str(__sub)
88
92
    else:
89
 
        raise AssertionError("version_info %r not valid" % version_info)
 
93
        raise ValueError("version_info %r not valid" % (version_info,))
90
94
 
91
95
    version_string = '%d.%d.%d.%s.%d' % version_info
92
96
    return main_version + __sub_string