/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/ftp_server/pyftpdlib_based.py

  • Committer: Andrew Bennetts
  • Date: 2010-01-15 04:05:36 UTC
  • mfrom: (4963 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100115040536-9l6iz5an8tqq9ny7
Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/ftp_server/pyftpdlib_based.py
53
53
        return [osutils.safe_utf8(s) for s in os.listdir(path)]
54
54
 
55
55
    def fs2ftp(self, fspath):
56
 
        p = ftpserver.AbstractedFS.fs2ftp(self, fspath)
 
56
        p = ftpserver.AbstractedFS.fs2ftp(self, osutils.safe_unicode(fspath))
57
57
        return osutils.safe_utf8(p)
58
58
 
59
59
    def ftp2fs(self, ftppath):