/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 bzrlib/lockdir.py

  • Committer: Jelmer Vernooij
  • Date: 2017-02-05 15:38:26 UTC
  • mto: (6621.2.1 py3)
  • mto: This revision was merged to the branch mainline in revision 6624.
  • Revision ID: jelmer@jelmer.uk-20170205153826-rnrd0m3iqoizqvrw
Apply 2to3 except fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
214
214
        self._trace("create lock directory")
215
215
        try:
216
216
            self.transport.mkdir(self.path, mode=mode)
217
 
        except (TransportError, PathError), e:
 
217
        except (TransportError, PathError) as e:
218
218
            raise LockFailed(self, e)
219
219
 
220
220
    def _attempt_lock(self):
236
236
        start_time = time.time()
237
237
        try:
238
238
            tmpname = self._create_pending_dir()
239
 
        except (errors.TransportError, PathError), e:
 
239
        except (errors.TransportError, PathError) as e:
240
240
            self._trace("... failed to create pending dir, %s", e)
241
241
            raise LockFailed(self, e)
242
242
        while True:
244
244
                self.transport.rename(tmpname, self._held_dir)
245
245
                break
246
246
            except (errors.TransportError, PathError, DirectoryNotEmpty,
247
 
                    FileExists, ResourceBusy), e:
 
247
                    FileExists, ResourceBusy) as e:
248
248
                self._trace("... contention, %s", e)
249
249
                other_holder = self.peek()
250
250
                self._trace("other holder is %r" % other_holder)
253
253
                except:
254
254
                    self._remove_pending_dir(tmpname)
255
255
                    raise
256
 
            except Exception, e:
 
256
            except Exception as e:
257
257
                self._trace("... lock failed, %s", e)
258
258
                self._remove_pending_dir(tmpname)
259
259
                raise
317
317
        try:
318
318
            self.transport.delete(tmpname + self.__INFO_NAME)
319
319
            self.transport.rmdir(tmpname)
320
 
        except PathError, e:
 
320
        except PathError as e:
321
321
            note(gettext("error removing pending lock: %s"), e)
322
322
 
323
323
    def _create_pending_dir(self):
368
368
            self.transport.delete(tmpname + self.__INFO_NAME)
369
369
            try:
370
370
                self.transport.rmdir(tmpname)
371
 
            except DirectoryNotEmpty, e:
 
371
            except DirectoryNotEmpty as e:
372
372
                # There might have been junk left over by a rename that moved
373
373
                # another locker within the 'held' directory.  do a slower
374
374
                # deletion where we list the directory and remove everything
399
399
        self._check_not_locked()
400
400
        try:
401
401
            holder_info = self.peek()
402
 
        except LockCorrupt, e:
 
402
        except LockCorrupt as e:
403
403
            # The lock info is corrupt.
404
404
            if ui.ui_factory.get_boolean(u"Break (corrupt %r)" % (self,)):
405
405
                self.force_break_corrupt(e.file_data)
531
531
            info = self._read_info_file(self._held_info_path)
532
532
            self._trace("peek -> held")
533
533
            return info
534
 
        except NoSuchFile, e:
 
534
        except NoSuchFile as e:
535
535
            self._trace("peek -> not held")
536
536
 
537
537
    def _prepare_info(self):
792
792
        lines = osutils.split_lines(info_file_bytes)
793
793
        try:
794
794
            stanza = rio.read_stanza(lines)
795
 
        except ValueError, e:
 
795
        except ValueError as e:
796
796
            mutter('Corrupt lock info file: %r', lines)
797
797
            raise LockCorrupt("could not parse lock info file: " + str(e),
798
798
                lines)