← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockable_files.py

  • Committer: Martin Pool
  • Date: 2008-04-24 07:22:53 UTC
  • mto: This revision was merged to the branch mainline in revision 3415.
  • Revision ID: mbp@sourcefrog.net-20080424072253-opmjij7xfy38w27f
Remove every assert statement from bzrlib!

Depending on the context they are:

 * turned into an explicit if/raise of either AssertionError 
   or something more specific -- particularly where they protect
   programming interfaces, complex invariants, or data file integrity
 * removed, if they're redundant with a later check, not protecting
   a meaningful invariant
 * turned into a selftest method on tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockable_files.py
242
242
    def lock_read(self):
243
243
        # mutter("lock read: %s (%s)", self, self._lock_count)
244
244
        if self._lock_mode:
245
 
            assert self._lock_mode in ('r', 'w'), \
246
 
                   "invalid lock mode %r" % self._lock_mode
 
245
            if self._lock_mode not in ('r', 'w'):
 
246
                raise ValueError("invalid lock mode %r" % (self._lock_mode,))
247
247
            self._lock_count += 1
248
248
        else:
249
249
            self._lock.lock_read()