← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/win32utils.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-15 17:02:13 UTC
  • mfrom: (4442 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4449.
  • Revision ID: john@arbash-meinel.com-20090615170213-3sgtjlvsr50v9r12
Merge bzr.dev 4442, in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/win32utils.py
267
267
 
268
268
    Returned value can be unicode or plain string.
269
269
    To convert plain string to unicode use
270
 
    s.decode(bzrlib.user_encoding)
 
270
    s.decode(osutils.get_user_encoding())
271
271
    (XXX - but see bug 262874, which asserts the correct encoding is 'mbcs')
272
272
    """
273
273
    local = _get_sh_special_folder_path(CSIDL_LOCAL_APPDATA)