Rev 626: Use bzrlib.api.require_any_version() rather than doing our own version checking. in http://people.samba.org/bzr/jelmer/bzr-gtk/trunk

Jelmer Vernooij jelmer at samba.org
Fri Jan 30 15:49:51 GMT 2009


At http://people.samba.org/bzr/jelmer/bzr-gtk/trunk

------------------------------------------------------------
revno: 626
revision-id: jelmer at samba.org-20090130154934-2ocm2cwvp04joiu1
parent: jelmer at samba.org-20090112011935-2w6c6e1aigl4imd9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2009-01-30 16:49:34 +0100
message:
  Use bzrlib.api.require_any_version() rather than doing our own version checking.
=== modified file '__init__.py'
--- a/__init__.py	2008-10-23 08:14:59 +0000
+++ b/__init__.py	2009-01-30 15:49:34 +0000
@@ -37,6 +37,7 @@
 import sys
 
 import bzrlib
+import bzrlib.api
 
 version_info = (0, 96, 0, 'dev', 1)
 
@@ -46,28 +47,10 @@
     version_string = '%d.%d.%d%s%d' % version_info
 __version__ = version_string
 
-required_bzrlib = (1, 6)
-
-def check_bzrlib_version(desired):
-    """Check that bzrlib is compatible.
-
-    If version is < bzr-gtk version, assume incompatible.
-    """
-    bzrlib_version = bzrlib.version_info[:2]
-    try:
-        from bzrlib.trace import warning
-    except ImportError:
-        # get the message out any way we can
-        from warnings import warn as warning
-    if bzrlib_version < desired:
-        from bzrlib.errors import BzrError
-        warning('Installed Bazaar version %s is too old to be used with bzr-gtk'
-                ' %s.' % (bzrlib.__version__, __version__))
-        raise BzrError('Version mismatch: %r, %r' % (version_info, bzrlib.version_info) )
-
-
-if version_info[2] == "final":
-    check_bzrlib_version(required_bzrlib)
+COMPATIBLE_BZR_VERSIONS = [(1, 6, 0), (1, 7, 0), (1, 8, 0), (1, 9, 0),
+                           (1, 10, 0), (1, 11, 0), (1, 12, 0)]
+
+bzrlib.api.require_any_api(bzrlib, COMPATIBLE_BZR_VERSIONS)
 
 from bzrlib.trace import warning
 if __name__ != 'bzrlib.plugins.gtk':




More information about the bazaar-commits mailing list