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

  • Committer: Breezy landing bot
  • Author(s): Colin Watson
  • Date: 2020-11-16 21:47:08 UTC
  • mfrom: (7521.1.1 remove-lp-workaround)
  • Revision ID: breezy.the.bot@gmail.com-20201116214708-jos209mgxi41oy15
Remove breezy.git workaround for bazaar.launchpad.net.

Merged from https://code.launchpad.net/~cjwatson/brz/remove-lp-workaround/+merge/393710

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 
17
17
"""Interface thunk for a StaticTuple implementation."""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
 
from bzrlib import debug
 
19
from . import debug
22
20
 
23
21
try:
24
 
    from bzrlib._static_tuple_c import StaticTuple
25
 
except ImportError, e:
26
 
    from bzrlib import osutils
 
22
    from ._static_tuple_c import StaticTuple
 
23
except ImportError as e:
 
24
    from . import osutils
27
25
    osutils.failed_to_load_extension(e)
28
 
    from bzrlib._static_tuple_py import StaticTuple
 
26
    from ._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 type(obj) is not StaticTuple:
 
40
    if not isinstance(obj, StaticTuple):
43
41
        raise TypeError('We expected a StaticTuple not a %s' % (type(obj),))
44
42
    return obj
45
43