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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2007,2009 Canonical Ltd
 
1
# Copyright (C) 2007, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
"""Wrapper around the bencode pyrex and python implementation"""
18
18
 
19
 
from bzrlib import osutils
 
19
from . import osutils
20
20
 
21
21
try:
22
 
    from bzrlib._bencode_pyx import bdecode, bdecode_as_tuple, bencode, Bencached
23
 
except ImportError, e:
 
22
    from ._bencode_pyx import bdecode, bdecode_as_tuple, bencode, Bencached
 
23
except ImportError as e:
24
24
    osutils.failed_to_load_extension(e)
25
 
    from bzrlib.util._bencode_py import bdecode, bdecode_as_tuple, bencode, Bencached
 
25
    from .util._bencode_py import (  # noqa: F401
 
26
        bdecode,
 
27
        bdecode_as_tuple,
 
28
        bencode,
 
29
        Bencached,
 
30
        )