/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-08-21 09:32:52 UTC
  • mfrom: (7065.3.15 python-bundle)
  • Revision ID: breezy.the.bot@gmail.com-20180821093252-dhir83sygqwzbv77
Fix some bundle-related tests on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python-bundle/+merge/353123

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/cache_utf8.py
109
109
    # same hash, so we can just use it as the key in _uni_to_utf8, but we need
110
110
    # the return value to be different in _utf8_to_uni
111
111
    ascii_str = _uni_to_utf8.setdefault(ascii_str, ascii_str)
112
 
    _utf8_to_uni.setdefault(ascii_str, unicode(ascii_str))
 
112
    _utf8_to_uni.setdefault(ascii_str, ascii_str.decode('ascii'))
113
113
    return ascii_str
114
114
 
115
115