/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 breezy/plugins/git/memorytree.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-25 03:06:42 UTC
  • mfrom: (7045.3.4 python3-r)
  • Revision ID: breezy.the.bot@gmail.com-20180725030642-oghhedvui3470wy6
Fix another ~500 tests on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-r/+merge/350430

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/memorytree.py
37
37
    osutils,
38
38
    revision as _mod_revision,
39
39
    tree as _mod_tree,
 
40
    urlutils,
40
41
    )
41
42
from breezy.transport.memory import MemoryTransport
42
43
 
176
177
        return stat_val
177
178
 
178
179
    def _live_entry(self, path):
 
180
        path = urlutils.quote_from_bytes(path)
179
181
        stat_val = self._lstat(path)
180
182
        if stat.S_ISDIR(stat_val.st_mode):
181
183
            return None
182
184
        elif stat.S_ISLNK(stat_val.st_mode):
183
 
            blob = Blob.from_string(self._file_transport.readlink(path))
 
185
            blob = Blob.from_string(self._file_transport.readlink(path).encode('utf-8'))
184
186
        elif stat.S_ISREG(stat_val.st_mode):
185
187
            blob = Blob.from_string(self._file_transport.get_bytes(path))
186
188
        else: