/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/static_tuple.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/static_tuple.py
16
16
 
17
17
"""Interface thunk for a StaticTuple implementation."""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
 
from . import debug
 
19
from bzrlib import debug
22
20
 
23
21
try:
24
 
    from ._static_tuple_c import StaticTuple
25
 
except ImportError as e:
26
 
    from . import osutils
 
22
    from bzrlib._static_tuple_c import StaticTuple
 
23
except ImportError, e:
 
24
    from bzrlib import osutils
27
25
    osutils.failed_to_load_extension(e)
28
 
    from ._static_tuple_py import StaticTuple
 
26
    from bzrlib._static_tuple_py import StaticTuple
29
27
 
30
28
 
31
29
def expect_static_tuple(obj):
39
37
    """
40
38
    if 'static_tuple' not in debug.debug_flags:
41
39
        return StaticTuple.from_sequence(obj)
42
 
    if not isinstance(obj, StaticTuple):
 
40
    if type(obj) is not StaticTuple:
43
41
        raise TypeError('We expected a StaticTuple not a %s' % (type(obj),))
44
42
    return obj
45
43