/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/switch.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/switch.py
72
72
    """
73
73
    try:
74
74
        tree = control.open_workingtree()
75
 
    except errors.NotBranchError, ex:
 
75
    except errors.NotBranchError as ex:
76
76
        # Lightweight checkout and branch is no longer there
77
77
        if force:
78
78
            return
111
111
                        'Cannot switch as local commits found in the checkout. '
112
112
                        'Commit these to the bound branch or use --force to '
113
113
                        'throw them away.'))
114
 
            except errors.BoundBranchConnectionFailure, e:
 
114
            except errors.BoundBranchConnectionFailure as e:
115
115
                raise errors.BzrCommandError(gettext(
116
116
                        'Unable to connect to current master branch %(target)s: '
117
117
                        '%(error)s To switch anyway, use --force.') %