← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/remote.py

  • Committer: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/remote.py
1
 
# Copyright (C) 2006-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2006-2010 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
36
36
    urlutils,
37
37
    )
38
38
from bzrlib.smart import client, medium
 
39
from bzrlib.symbol_versioning import (
 
40
    deprecated_method,
 
41
    )
39
42
 
40
43
 
41
44
class _SmartStat(object):
247
250
        transport._file_streams[self.abspath(relpath)] = result
248
251
        return result
249
252
 
250
 
    def put_bytes(self, relpath, raw_bytes, mode=None):
251
 
        if not isinstance(raw_bytes, str):
252
 
            raise TypeError(
253
 
                'raw_bytes must be a plain string, not %s' % type(raw_bytes))
254
 
        resp = self._call_with_body_bytes(
255
 
            'put',
 
253
    def put_bytes(self, relpath, upload_contents, mode=None):
 
254
        # FIXME: upload_file is probably not safe for non-ascii characters -
 
255
        # should probably just pass all parameters as length-delimited
 
256
        # strings?
 
257
        if type(upload_contents) is unicode:
 
258
            # Although not strictly correct, we raise UnicodeEncodeError to be
 
259
            # compatible with other transports.
 
260
            raise UnicodeEncodeError(
 
261
                'undefined', upload_contents, 0, 1,
 
262
                'put_bytes must be given bytes, not unicode.')
 
263
        resp = self._call_with_body_bytes('put',
256
264
            (self._remote_path(relpath), self._serialise_optional_mode(mode)),
257
 
            raw_bytes)
 
265
            upload_contents)
258
266
        self._ensure_ok(resp)
259
 
        return len(raw_bytes)
 
267
        return len(upload_contents)
260
268
 
261
 
    def put_bytes_non_atomic(self, relpath, raw_bytes, mode=None,
 
269
    def put_bytes_non_atomic(self, relpath, bytes, mode=None,
262
270
                             create_parent_dir=False,
263
271
                             dir_mode=None):
264
272
        """See Transport.put_bytes_non_atomic."""
271
279
            'put_non_atomic',
272
280
            (self._remote_path(relpath), self._serialise_optional_mode(mode),
273
281
             create_parent_str, self._serialise_optional_mode(dir_mode)),
274
 
            raw_bytes)
 
282
            bytes)
275
283
        self._ensure_ok(resp)
276
284
 
277
285
    def put_file(self, relpath, upload_file, mode=None):