← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/cache_utf8.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

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):