Rev 2482: Try raising AssertionError instead of using assert. in http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/simple_dirstate_optimization

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/simple_dirstate_optimization

------------------------------------------------------------
revno: 2482
revision-id: john at arbash-meinel.com-20070504220422-ir7p3g3kf9whusoj
parent: pqm at pqm.ubuntu.com-20070504034556-wzcw478l7qkppkq0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: simple_dirstate_optimization
timestamp: Fri 2007-05-04 17:04:22 -0500
message:
  Try raising AssertionError instead of using assert.
  It is faster in pyrex, but seems to be slower in real python
modified:
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
-------------- next part --------------
=== modified file 'bzrlib/dirstate.py'
--- a/bzrlib/dirstate.py	2007-04-21 14:39:50 +0000
+++ b/bzrlib/dirstate.py	2007-05-04 22:04:22 +0000
@@ -1553,11 +1553,12 @@
             expected_field_count = entry_size * self._num_entries
             field_count = len(fields)
             # this checks our adjustment, and also catches file too short.
-            assert field_count - cur == expected_field_count, \
-                'field count incorrect %s != %s, entry_size=%s, '\
-                'num_entries=%s fields=%r' % (
-                    field_count - cur, expected_field_count, entry_size,
-                    self._num_entries, fields)
+            if (field_count - cur) != expected_field_count:
+                raise AssertionError(
+                    'field count incorrect %s != %s, entry_size=%s, '
+                    'num_entries=%s fields=%r' % (
+                        field_count - cur, expected_field_count, entry_size,
+                        self._num_entries, fields))
 
             if num_present_parents == 1:
                 # Bind external functions to local names