/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: Vincent Ladeuil
  • Date: 2012-01-13 15:05:42 UTC
  • mfrom: (6015.44.10 2.4)
  • mto: (6437.3.1 2.5)
  • mto: This revision was merged to the branch mainline in revision 6439.
  • Revision ID: v.ladeuil+lp@free.fr-20120113150542-510rp0ep0fa2zqoz
Merge 2.4 into 2.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 
17
17
"""Wrapper around the bencode pyrex and python implementation"""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
from bzrlib import osutils
20
22
 
21
23
try: