/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: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

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