← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/__init__.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/__init__.py
34
34
from bzrlib.errors import BzrError, UnlistableStore, TransportNotPossible
35
35
from bzrlib.symbol_versioning import *
36
36
from bzrlib.trace import mutter
37
 
from bzrlib.transport import Transport, urlescape
 
37
from bzrlib.transport import Transport
38
38
from bzrlib.transport.local import LocalTransport
 
39
import bzrlib.urlutils as urlutils
39
40
 
40
41
######################################################################
41
42
# stores
302
303
        fileid = self._escape_file_id(fileid)
303
304
        path = prefix + fileid
304
305
        full_path = u'.'.join([path] + suffixes)
305
 
        return urlescape(full_path)
 
306
        return urlutils.escape(full_path)
306
307
 
307
308
    def _escape_file_id(self, file_id):
308
309
        """Turn a file id into a filesystem safe string.