/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 20:02:36 UTC
  • mto: (7490.7.7 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200322200236-fsbl91ktcn6fcbdd
Fix tests.

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