← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/memory.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/memory.py
128
128
        """See Transport.put_file()."""
129
129
        _abspath = self._abspath(relpath)
130
130
        self._check_parent(_abspath)
131
 
        self._files[_abspath] = (f.read(), mode)
 
131
        bytes = f.read()
 
132
        if type(bytes) is not str:
 
133
            # Although not strictly correct, we raise UnicodeEncodeError to be
 
134
            # compatible with other transports.
 
135
            raise UnicodeEncodeError(
 
136
                'undefined', bytes, 0, 1,
 
137
                'put_file must be given a file of bytes, not unicode.')
 
138
        self._files[_abspath] = (bytes, mode)
132
139
 
133
140
    def mkdir(self, relpath, mode=None):
134
141
        """See Transport.mkdir()."""