/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/repository.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:
280
280
                (self._write_group, self.get_transaction()))
281
281
        try:
282
282
            self._abort_write_group()
283
 
        except Exception, exc:
 
283
        except Exception as exc:
284
284
            self._write_group = None
285
285
            if not suppress_errors:
286
286
                raise
964
964
        try:
965
965
            _iter_for_revno(
966
966
                self, partial_history, stop_index=distance_from_known)
967
 
        except errors.RevisionNotPresent, err:
 
967
        except errors.RevisionNotPresent as err:
968
968
            if err.revision_id == known_revid:
969
969
                # The start revision (known_revid) wasn't found.
970
970
                raise
1694
1694
        try:
1695
1695
            InterRepository._assert_same_model(source, target)
1696
1696
            return True
1697
 
        except errors.IncompatibleRepositories, e:
 
1697
        except errors.IncompatibleRepositories as e:
1698
1698
            return False
1699
1699
 
1700
1700
    @staticmethod