/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/smart/request.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/smart/request.py
35
35
 
36
36
import threading
37
37
 
38
 
from breezy import (
 
38
from .. import (
39
39
    debug,
40
40
    errors,
41
41
    osutils,
44
44
    trace,
45
45
    urlutils,
46
46
    )
47
 
from breezy.lazy_import import lazy_import
 
47
from ..lazy_import import lazy_import
48
48
lazy_import(globals(), """
49
49
from breezy import bzrdir
50
50
from breezy.bundle import serializer
360
360
                self._command.teardown_jail()
361
361
        except (KeyboardInterrupt, SystemExit):
362
362
            raise
363
 
        except Exception, err:
 
363
        except Exception as err:
364
364
            err_struct = _translate_error(err)
365
365
            return FailedSmartServerResponse(err_struct)
366
366
 
380
380
                            cmd, repr(args)[1:-1])
381
381
            raise errors.UnknownSmartMethod(cmd)
382
382
        if 'hpss' in debug.debug_flags:
383
 
            from breezy.smart import vfs
 
383
            from . import vfs
384
384
            if issubclass(command, vfs.VfsRequest):
385
385
                action = 'hpss vfs req'
386
386
            else: