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

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bencode.py
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 . import osutils
 
19
from __future__ import absolute_import
 
20
 
 
21
from bzrlib import osutils
20
22
 
21
23
try:
22
 
    from ._bencode_pyx import bdecode, bdecode_as_tuple, bencode, Bencached
23
 
except ImportError as e:
 
24
    from bzrlib._bencode_pyx import bdecode, bdecode_as_tuple, bencode, Bencached
 
25
except ImportError, e:
24
26
    osutils.failed_to_load_extension(e)
25
 
    from .util._bencode_py import (  # noqa: F401
26
 
        bdecode,
27
 
        bdecode_as_tuple,
28
 
        bencode,
29
 
        Bencached,
30
 
        )
 
27
    from bzrlib.util._bencode_py import bdecode, bdecode_as_tuple, bencode, Bencached