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

  • Committer: Martin Packman
  • Date: 2012-09-05 18:16:08 UTC
  • mfrom: (6015.57.3 2.4)
  • mto: (6437.63.6 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: martin.packman@canonical.com-20120905181608-1zunhfyexa0xauxz
Merge 2.4 into 2.5 resolving conflict by taking existing code bzrlib.btree_index

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/cache_utf8.py
19
19
 
20
20
"""Some functions to enable caching the conversion between unicode to utf8"""
21
21
 
 
22
from __future__ import absolute_import
 
23
 
22
24
import codecs
23
25
 
24
 
 
25
26
_utf8_encode = codecs.utf_8_encode
26
27
_utf8_decode = codecs.utf_8_decode
27
28
def _utf8_decode_with_None(bytestring, _utf8_decode=_utf8_decode):