/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/transform.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-25 18:15:53 UTC
  • mfrom: (7045.4.7 python3-s)
  • Revision ID: breezy.the.bot@gmail.com-20180725181553-mz6zhncntlovb8ii
Fix another couple of hundred tests on Python 3.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
1105
1105
                      for k, v in viewitems(self._new_parent)}
1106
1106
        new_id = {k.encode('utf-8'): v
1107
1107
                  for k, v in viewitems(self._new_id)}
1108
 
        new_executability = {k: int(v)
 
1108
        new_executability = {k.encode('utf-8'): int(v)
1109
1109
                             for k, v in viewitems(self._new_executability)}
1110
1110
        tree_path_ids = {k.encode('utf-8'): v.encode('utf-8')
1111
1111
                         for k, v in viewitems(self._tree_path_ids)}
1157
1157
                          for k, v in viewitems(attribs[b'_new_name'])}
1158
1158
        self._new_parent = {k.decode('utf-8'): v.decode('utf-8')
1159
1159
                            for k, v in viewitems(attribs[b'_new_parent'])}
1160
 
        self._new_executability = {k: bool(v)
 
1160
        self._new_executability = {k.decode('utf-8'): bool(v)
1161
1161
            for k, v in viewitems(attribs[b'_new_executability'])}
1162
1162
        self._new_id = {k.decode('utf-8'): v
1163
1163
                        for k, v in viewitems(attribs[b'_new_id'])}
2344
2344
                size = None
2345
2345
                executable = None
2346
2346
            if kind == 'symlink':
2347
 
                link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
 
2347
                link_or_sha1 = os.readlink(limbo_name)
 
2348
                if not isinstance(link_or_sha1, text_type):
 
2349
                    link_or_sha1 = link_or_sha1.decode(osutils._fs_enc)
2348
2350
        executable = tt._new_executability.get(trans_id, executable)
2349
2351
        return kind, size, executable, link_or_sha1
2350
2352