~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockable_files.py

  • Committer: Aaron Bentley
  • Date: 2006-09-25 21:54:28 UTC
  • mto: This revision was merged to the branch mainline in revision 2042.
  • Revision ID: aaron.bentley@utoronto.ca-20060925215428-b2fe01fddf80004b
Change angle brackets to square brackets

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
 
 
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
193
193
                     directory
194
194
        :param f: A file-like or string object whose contents should be copied.
195
195
        """
196
 
        self._transport.put(self._escape(path), file, mode=self._file_mode)
 
196
        self._transport.put_file(self._escape(path), file, mode=self._file_mode)
197
197
 
198
198
    @needs_write_lock
199
199
    def put_utf8(self, path, a_string):
339
339
    def create(self, mode=None):
340
340
        """Create lock mechanism"""
341
341
        # for old-style locks, create the file now
342
 
        self._transport.put(self._escaped_name, StringIO(), 
 
342
        self._transport.put_bytes(self._escaped_name, '',
343
343
                            mode=self._file_modebits)