/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: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

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