~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 4935.1.3.

  • Committer: Vincent Ladeuil
  • Date: 2010-01-13 14:38:57 UTC
  • mto: (4955.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4956.
  • Revision ID: v.ladeuil+lp@free.fr-20100113143857-oopfzxx5g7ai53u1
Better fix for fancy_rename respecting callers file encoding.

* bzrlib/tests/ftp_server/pyftpdlib_based.py:
(BzrConformingFS.fs2ftp): Force unicode paths to avoid spurious
warnings (and make code more explicit too).

* bzrlib/osutils.py:
(fancy_rename): Don't force unicode on callers, some of them
*requires* str objects.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: