← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockable_files.py

  • Committer: John Arbash Meinel
  • Date: 2006-05-02 20:46:11 UTC
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20060502204611-02caa5c20fb84ef8
Moved url functions into bzrlib.urlutils

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockable_files.py
26
26
from bzrlib.symbol_versioning import *
27
27
from bzrlib.trace import mutter, note
28
28
import bzrlib.transactions as transactions
 
29
import bzrlib.urlutils as urlutils
 
30
 
29
31
 
30
32
# XXX: The tracking here of lock counts and whether the lock is held is
31
33
# somewhat redundant with what's done in LockDir; the main difference is that
114
116
            file_or_path = '/'.join(file_or_path)
115
117
        if file_or_path == '':
116
118
            return u''
117
 
        return bzrlib.transport.urlescape(safe_unicode(file_or_path))
 
119
        return urlutils.escape(safe_unicode(file_or_path))
118
120
 
119
121
    def _find_modes(self):
120
122
        """Determine the appropriate modes for files and directories."""