← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/win32utils.py

Merge in bzr.dev 3801, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/win32utils.py
319
319
 
320
320
 
321
321
def _ensure_unicode(s):
 
322
    from bzrlib import osutils
322
323
    if s and type(s) != unicode:
 
324
        from bzrlib import osutils
323
325
        s = s.decode(osutils.get_user_encoding())
324
326
    return s
325
327