Rev 3914: Get rid of asserts for chp_map.py and _chk_map_py.py in file:///home/vila/src/bzr/experimental/bbc-cleanups/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/bbc-cleanups/

------------------------------------------------------------
revno: 3914
revision-id: v.ladeuil+lp at free.fr-20090331160431-m9335vx3suhjrqvp
parent: v.ladeuil+lp at free.fr-20090331155349-yk34dm2qfriqczib
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bbc-cleanups
timestamp: Tue 2009-03-31 18:04:31 +0200
message:
  Get rid of asserts for chp_map.py and _chk_map_py.py
-------------- next part --------------
=== modified file 'bzrlib/_chk_map_py.py'
--- a/bzrlib/_chk_map_py.py	2009-03-25 07:54:11 +0000
+++ b/bzrlib/_chk_map_py.py	2009-03-31 16:04:31 +0000
@@ -142,6 +142,8 @@
         line = common_prefix + line
         prefix, flat_key = line.rsplit('\x00', 1)
         items[prefix] = (flat_key,)
+    if len(items) == 0:
+        raise AssertionError("We didn't find any item for %s" % key)
     result._items = items
     result._len = length
     result._maximum_size = maximum_size
@@ -151,7 +153,6 @@
     #      change if we add prefix compression
     result._raw_size = None # len(bytes)
     result._node_width = len(prefix)
-    assert len(items) > 0
     result._search_prefix = common_prefix
     return result
 

=== modified file 'bzrlib/chk_map.py'
--- a/bzrlib/chk_map.py	2009-03-30 21:13:24 +0000
+++ b/bzrlib/chk_map.py	2009-03-31 16:04:31 +0000
@@ -413,7 +413,9 @@
                             self_pending)
                         basis_prefix, _, basis_node, basis_path = heapq.heappop(
                             basis_pending)
-                        assert self_prefix == basis_prefix
+                        if self_prefix != basis_prefix:
+                            raise AssertionError(
+                                '%r != %r' % (self_prefix, basis_prefix))
                         process_common_prefix_nodes(
                             self_node, self_path,
                             basis_node, basis_path)
@@ -736,7 +738,8 @@
 
         :return: (common_serialised_prefix, [(node_serialised_prefix, node)])
         """
-        assert self._search_prefix is not _unknown
+        if self._search_prefix is _unknown:
+            raise AssertionError('%r must be known' % self._search_prefix)
         common_prefix = self._search_prefix
         split_at = len(common_prefix) + 1
         result = {}
@@ -772,7 +775,8 @@
         if self._map_no_split(key, value):
             return self._split(store)
         else:
-            assert self._search_prefix is not _unknown
+            if self._search_prefix is _unknown:
+                raise AssertionError('%r must be known' % self._search_prefix)
             return self._search_prefix, [("", self)]
 
     def serialise(self, store):