← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

  • Committer: Wouter van Heyst
  • Date: 2011-05-16 17:25:49 UTC
  • mfrom: (5866 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5893.
  • Revision ID: larstiq@larstiq.dyndns.org-20110516172549-7v5objmi6pbgc3i8
Merge bzr.dev to get the _format_version_tuple change (r5866)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/__init__.py
81
81
    1.4.0
82
82
    >>> print _format_version_tuple((1, 4))
83
83
    1.4
84
 
    >>> print _format_version_tuple((2, 1, 0, 'final', 1))
85
 
    Traceback (most recent call last):
86
 
    ...
87
 
    ValueError: version_info (2, 1, 0, 'final', 1) not valid
 
84
    >>> print _format_version_tuple((2, 1, 0, 'final', 42))
 
85
    2.1.0.42
88
86
    >>> print _format_version_tuple((1, 4, 0, 'wibble', 0))
89
 
    Traceback (most recent call last):
90
 
    ...
91
 
    ValueError: version_info (1, 4, 0, 'wibble', 0) not valid
 
87
    1.4.0.wibble.0
92
88
    """
93
89
    if len(version_info) == 2:
94
90
        main_version = '%d.%d' % version_info[:2]
100
96
    release_type = version_info[3]
101
97
    sub = version_info[4]
102
98
 
103
 
    # check they're consistent
104
99
    if release_type == 'final' and sub == 0:
105
100
        sub_string = ''
 
101
    elif release_type == 'final':
 
102
        sub_string = '.' + str(sub)
106
103
    elif release_type == 'dev' and sub == 0:
107
104
        sub_string = 'dev'
108
105
    elif release_type == 'dev':
114
111
    elif release_type == 'candidate':
115
112
        sub_string = 'rc' + str(sub)
116
113
    else:
117
 
        raise ValueError("version_info %r not valid" % (version_info,))
 
114
        return '.'.join(map(str, version_info))
118
115
 
119
116
    return main_version + sub_string
120
117