← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/remote.py

  • Committer: Vincent Ladeuil
  • Date: 2016-01-21 17:48:07 UTC
  • mto: This revision was merged to the branch mainline in revision 6613.
  • Revision ID: v.ladeuil+lp@free.fr-20160121174807-g4ybpaij9ln5wj6a
https://launchpad.net/bugs/106898
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.

There was a mix of AssertionError or UnicodeEncodeError.

Also deleted test_put_file_unicode() which was bogus, files contain bytes not unicode strings.

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
247
247
        transport._file_streams[self.abspath(relpath)] = result
248
248
        return result
249
249
 
250
 
    def put_bytes(self, relpath, upload_contents, mode=None):
251
 
        # FIXME: upload_file is probably not safe for non-ascii characters -
252
 
        # should probably just pass all parameters as length-delimited
253
 
        # strings?
254
 
        if type(upload_contents) is unicode:
255
 
            # Although not strictly correct, we raise UnicodeEncodeError to be
256
 
            # compatible with other transports.
257
 
            raise UnicodeEncodeError(
258
 
                'undefined', upload_contents, 0, 1,
259
 
                'put_bytes must be given bytes, not unicode.')
260
 
        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',
261
256
            (self._remote_path(relpath), self._serialise_optional_mode(mode)),
262
 
            upload_contents)
 
257
            raw_bytes)
263
258
        self._ensure_ok(resp)
264
 
        return len(upload_contents)
 
259
        return len(raw_bytes)
265
260
 
266
 
    def put_bytes_non_atomic(self, relpath, bytes, mode=None,
 
261
    def put_bytes_non_atomic(self, relpath, raw_bytes, mode=None,
267
262
                             create_parent_dir=False,
268
263
                             dir_mode=None):
269
264
        """See Transport.put_bytes_non_atomic."""
276
271
            'put_non_atomic',
277
272
            (self._remote_path(relpath), self._serialise_optional_mode(mode),
278
273
             create_parent_str, self._serialise_optional_mode(dir_mode)),
279
 
            bytes)
 
274
            raw_bytes)
280
275
        self._ensure_ok(resp)
281
276
 
282
277
    def put_file(self, relpath, upload_file, mode=None):