/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transport/memory.py

  • Committer: Martin Pool
  • Date: 2007-04-01 06:19:16 UTC
  • mfrom: (2323.5.20 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2390.
  • Revision ID: mbp@sourcefrog.net-20070401061916-plpgsxdf8g7gll9o
Merge 0.15 final release back to trunk, including: recommend upgrades of old workingtrees, handle multiple http redirections, some dirstate fixes, 

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
 
        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)
 
131
        self._files[_abspath] = (f.read(), mode)
139
132
 
140
133
    def mkdir(self, relpath, mode=None):
141
134
        """See Transport.mkdir()."""