← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
167
167
        :param path: Path to the lock within the base directory of the 
168
168
            transport.
169
169
        """
170
 
        assert isinstance(transport, Transport), \
171
 
            ("not a transport: %r" % transport)
172
170
        self.transport = transport
173
171
        self.path = path
174
172
        self._lock_held = False
417
415
        try:
418
416
            info = self._read_info_file(self._held_info_path)
419
417
            self._trace("peek -> held")
420
 
            assert isinstance(info, dict), \
421
 
                    "bad parse result %r" % info
422
418
            return info
423
419
        except NoSuchFile, e:
424
420
            self._trace("peek -> not held")