Remove some bare asserts in retrieve.py (there are still quite a few left). refs...

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

diff --git a/src/allmydata/mutable/retrieve.py b/src/allmydata/mutable/retrieve.py
index 2be92163ec822df2c972bee9005a5ee264aa6a1f..6c2c5c9bf8c48d81c267d1a5ca79aa2b70ce1011 100644 (file)
--- a/src/allmydata/mutable/retrieve.py
+++ b/src/allmydata/mutable/retrieve.py
@@ -7,8 +7,10 @@ from twisted.python import failure
 from twisted.internet.interfaces import IPushProducer, IConsumer
 from foolscap.api import eventually, fireEventually, DeadReferenceError, \
      RemoteException
 from twisted.internet.interfaces import IPushProducer, IConsumer
 from foolscap.api import eventually, fireEventually, DeadReferenceError, \
      RemoteException

+

 from allmydata.interfaces import IRetrieveStatus, NotEnoughSharesError, \
      DownloadStopped, MDMF_VERSION, SDMF_VERSION
 from allmydata.interfaces import IRetrieveStatus, NotEnoughSharesError, \
      DownloadStopped, MDMF_VERSION, SDMF_VERSION

+from allmydata.util.assertutil import _assert

 from allmydata.util import hashutil, log, mathutil, deferredutil
 from allmydata.util.dictutil import DictOfSets
 from allmydata import hashtree, codec
 from allmydata.util import hashutil, log, mathutil, deferredutil
 from allmydata.util.dictutil import DictOfSets
 from allmydata import hashtree, codec


@@ -408,7 +410,9 @@ class Retrieve:
             # offset we were given.
             start = self._offset // self._segment_size
 
             # offset we were given.
             start = self._offset // self._segment_size
 

-            assert start < self._num_segments
+            _assert(start < self._num_segments,
+                    start=start, num_segments=self._num_segments,
+                    offset=self._offset, segment_size=self._segment_size)

             self._start_segment = start
             self.log("got start segment: %d" % self._start_segment)
         else:
             self._start_segment = start
             self.log("got start segment: %d" % self._start_segment)
         else:


@@ -429,7 +433,10 @@ class Retrieve:
                 # but the one before it.
                 end = (end_data - 1) // self._segment_size
 
                 # but the one before it.
                 end = (end_data - 1) // self._segment_size
 

-                assert end < self._num_segments
+                _assert(end < self._num_segments,
+                        end=end, num_segments=self._num_segments,
+                        end_data=end_data, offset=self._offset, read_length=self._read_length,
+                        segment_size=self._segment_size)

                 self._last_segment = end
             else:
                 self._last_segment = self._start_segment
                 self._last_segment = end
             else:
                 self._last_segment = self._start_segment