← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/cache_utf8.py

  • Committer: Robert Collins
  • Date: 2007-04-23 02:29:35 UTC
  • mfrom: (2441 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2442.
  • Revision ID: robertc@robertcollins.net-20070423022935-9hhongamvk6bfdso
Resolve conflicts with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/cache_utf8.py
24
24
 
25
25
_utf8_encode = codecs.getencoder("utf-8")
26
26
_utf8_decode = codecs.getdecoder("utf-8")
27
 
# wrap _utf8_decode to support None->None for optional strings.
28
27
def _utf8_decode_with_None(bytestring, _utf8_decode=_utf8_decode):
 
28
    """wrap _utf8_decode to support None->None for optional strings.
 
29
 
 
30
    Also, only return the Unicode portion, since we don't care about the second
 
31
    return value.
 
32
    """
29
33
    if bytestring is None:
30
 
        return (None, 0)
 
34
        return None
31
35
    else:
32
 
        return _utf8_decode(bytestring)
 
36
        return _utf8_decode(bytestring)[0]
33
37
 
34
38
# Map revisions from and to utf8 encoding
35
39
# Whenever we do an encode/decode operation, we save the result, so that