/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: Martin
  • Date: 2018-11-16 19:09:31 UTC
  • mfrom: (7175 work)
  • mto: This revision was merged to the branch mainline in revision 7177.
  • Revision ID: gzlist@googlemail.com-20181116190931-rmh7pk2an1zuecby
Merge trunk to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bencode.py
24
24
    from ._bencode_pyx import bdecode, bdecode_as_tuple, bencode, Bencached
25
25
except ImportError as e:
26
26
    osutils.failed_to_load_extension(e)
27
 
    from .util._bencode_py import bdecode, bdecode_as_tuple, bencode, Bencached  # noqa: F401
 
27
    from .util._bencode_py import (  # noqa: F401
 
28
        bdecode,
 
29
        bdecode_as_tuple,
 
30
        bencode,
 
31
        Bencached,
 
32
        )