← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

  • Committer: Andrew Bennetts
  • Date: 2008-10-01 05:40:45 UTC
  • mfrom: (3753 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20081001054045-z50qc0d3p9qsc5im
Merge from bzr.dev; resolve osutils.py conflict by reverting my sha import hackery.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/__init__.py
50
50
# Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
51
51
# releaselevel of 'dev' for unreleased under-development code.
52
52
 
53
 
version_info = (1, 7, 0, 'dev', 0)
 
53
version_info = (1, 8, 0, 'dev', 0)
54
54
 
55
55
 
56
56
# API compatibility version: bzrlib is currently API compatible with 1.7.
74
74
    1.1.1rc2
75
75
    >>> print _format_version_tuple((1, 4, 0))
76
76
    1.4
 
77
    >>> print _format_version_tuple((1, 4, 0, 'wibble', 0))
 
78
    Traceback (most recent call last):
 
79
    ...
 
80
    ValueError: version_info (1, 4, 0, 'wibble', 0) not valid
77
81
    """
78
82
    if version_info[2] == 0:
79
83
        main_version = '%d.%d' % version_info[:2]
95
99
    elif __release_type == 'candidate' and __sub != 0:
96
100
        __sub_string = 'rc' + str(__sub)
97
101
    else:
98
 
        raise AssertionError("version_info %r not valid" % version_info)
 
102
        raise ValueError("version_info %r not valid" % (version_info,))
99
103
 
100
104
    version_string = '%d.%d.%d.%s.%d' % version_info
101
105
    return main_version + __sub_string