← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/cache_utf8.py

  • Committer: John Arbash Meinel
  • Date: 2007-03-14 20:47:17 UTC
  • mto: (2353.4.2 locking)
  • mto: This revision was merged to the branch mainline in revision 2360.
  • Revision ID: john@arbash-meinel.com-20070314204717-htynwogv97fqr22a
Cleanup errors, and change ReadOnlyLockError to pass around more details.

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.
27
28
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
 
    """
33
29
    if bytestring is None:
34
 
        return None
 
30
        return (None, 0)
35
31
    else:
36
 
        return _utf8_decode(bytestring)[0]
 
32
        return _utf8_decode(bytestring)
37
33
 
38
34
# Map revisions from and to utf8 encoding
39
35
# Whenever we do an encode/decode operation, we save the result, so that