/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/upgrade.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/upgrade.py
18
18
 
19
19
from __future__ import absolute_import
20
20
 
21
 
from breezy import (
 
21
from . import (
22
22
    errors,
23
23
    trace,
24
24
    ui,
25
25
    urlutils,
26
26
    )
27
 
from breezy.controldir import (
 
27
from .controldir import (
28
28
    ControlDir,
29
29
    format_registry,
30
30
    )
31
 
from breezy.i18n import gettext
32
 
from breezy.remote import RemoteBzrDir
 
31
from .i18n import gettext
 
32
from .remote import RemoteBzrDir
33
33
 
34
34
 
35
35
class Convert(object):
285
285
        try:
286
286
            if not dry_run:
287
287
                cv = Convert(control_dir=control_dir, format=format)
288
 
        except errors.UpToDateFormat, ex:
 
288
        except errors.UpToDateFormat as ex:
289
289
            ui.ui_factory.note(str(ex))
290
290
            succeeded.append(control_dir)
291
291
            continue
292
 
        except Exception, ex:
 
292
        except Exception as ex:
293
293
            trace.warning('conversion error: %s' % ex)
294
294
            exceptions.append(ex)
295
295
            continue
301
301
                ui.ui_factory.note(gettext('Removing backup ...'))
302
302
                if not dry_run:
303
303
                    cv.clean_up()
304
 
            except Exception, ex:
 
304
            except Exception as ex:
305
305
                trace.warning(gettext('failed to clean-up {0}: {1}') % (location, ex))
306
306
                exceptions.append(ex)
307
307