← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockable_files.py

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockable_files.py
39
39
        if not isinstance(file_or_path, basestring):
40
40
            file_or_path = '/'.join(file_or_path)
41
41
        if file_or_path == '':
42
 
            return bzrlib.BZRDIR
43
 
        return bzrlib.transport.urlescape(bzrlib.BZRDIR + '/' + file_or_path)
 
42
            return unicode(bzrlib.BZRDIR)
 
43
        return bzrlib.transport.urlescape(unicode(bzrlib.BZRDIR + '/' + file_or_path))
44
44
 
45
45
    def controlfilename(self, file_or_path):
46
46
        """Return location relative to branch."""