← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/remote.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

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