← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/chk_map.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-11-03 03:58:26 UTC
  • mfrom: (4668.1.5 2.1.0b2)
  • Revision ID: pqm@pqm.ubuntu.com-20091103035826-tr4qa6fznzmirgiq
(jam) Merge 2.1.0b2 (-final) to bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/chk_map.py
50
50
    lru_cache,
51
51
    osutils,
52
52
    registry,
 
53
    static_tuple,
53
54
    trace,
54
55
    )
55
56
from bzrlib.static_tuple import StaticTuple
720
721
        :param bytes: The bytes of the node.
721
722
        :param key: The key that the serialised node has.
722
723
        """
 
724
        key = static_tuple.expect_static_tuple(key)
723
725
        return _deserialise_leaf_node(bytes, key,
724
726
                                      search_key_func=search_key_func)
725
727
 
1018
1020
        :param key: The key that the serialised node has.
1019
1021
        :return: An InternalNode instance.
1020
1022
        """
1021
 
        if type(key) is not StaticTuple:
1022
 
            raise AssertionError('deserialise should be called with a'
1023
 
                                 ' StaticTuple not %s' % (type(key),))
 
1023
        key = static_tuple.expect_static_tuple(key)
1024
1024
        return _deserialise_internal_node(bytes, key,
1025
1025
                                          search_key_func=search_key_func)
1026
1026