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

  • Committer: Jelmer Vernooij
  • Date: 2020-03-22 01:35:14 UTC
  • mfrom: (7490.7.6 work)
  • mto: This revision was merged to the branch mainline in revision 7499.
  • Revision ID: jelmer@jelmer.uk-20200322013514-7vw1ntwho04rcuj3
merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/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
 
 
24
22
import codecs
25
23
 
26
24
_utf8_encode = codecs.utf_8_encode
27
25
_utf8_decode = codecs.utf_8_decode
 
26
 
 
27
 
28
28
def _utf8_decode_with_None(bytestring, _utf8_decode=_utf8_decode):
29
29
    """wrap _utf8_decode to support None->None for optional strings.
30
30
 
36
36
    else:
37
37
        return _utf8_decode(bytestring)[0]
38
38
 
 
39
 
39
40
# Map revisions from and to utf8 encoding
40
41
# Whenever we do an encode/decode operation, we save the result, so that
41
42
# we don't have to do it again.
108
109
    # real Unicode string. Unicode and plain strings of this type will have the
109
110
    # same hash, so we can just use it as the key in _uni_to_utf8, but we need
110
111
    # the return value to be different in _utf8_to_uni
111
 
    ascii_str = _uni_to_utf8.setdefault(ascii_str, ascii_str)
112
 
    _utf8_to_uni.setdefault(ascii_str, unicode(ascii_str))
 
112
    uni_str = ascii_str.decode('ascii')
 
113
    ascii_str = _uni_to_utf8.setdefault(uni_str, ascii_str)
 
114
    _utf8_to_uni.setdefault(ascii_str, uni_str)
113
115
    return ascii_str
114
116
 
115
117