← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/win32utils.py

  • Committer: Martin Pool
  • Date: 2008-10-27 08:02:47 UTC
  • mfrom: (3795 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3798.
  • Revision ID: mbp@sourcefrog.net-20081027080247-0al6nrx2v8u1dcci
merge trunk

Show diffs side-by-side

added added

removed removed

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