/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/lockdir.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-12 01:41:38 UTC
  • mto: (7143.16.20 even-more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7175.
  • Revision ID: jelmer@jelmer.uk-20181112014138-3b0zyx91cu3wdq3k
More PEP8 fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/lockdir.py
171
171
 
172
172
    __INFO_NAME = '/info'
173
173
 
174
 
    def __init__(self, transport, path, file_modebits=0o644, dir_modebits=0o755,
175
 
                 extra_holder_info=None):
 
174
    def __init__(self, transport, path, file_modebits=0o644,
 
175
                 dir_modebits=0o755, extra_holder_info=None):
176
176
        """Create a new LockDir object.
177
177
 
178
178
        The LockDir is initially unlocked - this just creates the object.
251
251
                self._trace("other holder is %r" % other_holder)
252
252
                try:
253
253
                    self._handle_lock_contention(other_holder)
254
 
                except:
 
254
                except BaseException:
255
255
                    self._remove_pending_dir(tmpname)
256
256
                    raise
257
257
            except Exception as e:
369
369
            self.transport.delete(tmpname + self.__INFO_NAME)
370
370
            try:
371
371
                self.transport.rmdir(tmpname)
372
 
            except DirectoryNotEmpty as e:
 
372
            except DirectoryNotEmpty:
373
373
                # There might have been junk left over by a rename that moved
374
374
                # another locker within the 'held' directory.  do a slower
375
375
                # deletion where we list the directory and remove everything
529
529
            info = self._read_info_file(self._held_info_path)
530
530
            self._trace("peek -> held")
531
531
            return info
532
 
        except NoSuchFile as e:
 
532
        except NoSuchFile:
533
533
            self._trace("peek -> not held")
534
534
 
535
535
    def _prepare_info(self):
681
681
        # we can't rely on that remotely.  Once this is cleaned up,
682
682
        # reenable this warning to prevent it coming back in
683
683
        # -- mbp 20060303
684
 
        ## warn("LockDir.lock_read falls back to write lock")
 
684
        # warn("LockDir.lock_read falls back to write lock")
685
685
        if self._lock_held or self._fake_read_lock:
686
686
            raise LockContention(self)
687
687
        self._fake_read_lock = True