/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 breezy/lockable_files.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 12:50:32 UTC
  • mfrom: (6679 work)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610125032-xb5rd5fjskjallos
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/lockable_files.py
102
102
 
103
103
    def _escape(self, file_or_path):
104
104
        """DEPRECATED: Do not use outside this class"""
105
 
        if not isinstance(file_or_path, basestring):
106
 
            file_or_path = '/'.join(file_or_path)
107
105
        if file_or_path == '':
108
106
            return u''
109
 
        return urlutils.escape(osutils.safe_unicode(file_or_path))
 
107
        return urlutils.escape(file_or_path)
110
108
 
111
109
    def _find_modes(self):
112
110
        """Determine the appropriate modes for files and directories.
203
201
            try:
204
202
                self._lock.unlock()
205
203
            finally:
206
 
                self._lock_mode = self._lock_count = None
 
204
                self._lock_count = 0
 
205
                self._lock_mode = None
207
206
 
208
207
    def is_locked(self):
209
208
        """Return true if this LockableFiles group is locked"""