← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml7.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/xml7.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
from bzrlib import (
18
20
    inventory,
19
21
    xml6,
28
30
    supported_kinds = set(['file', 'directory', 'symlink', 'tree-reference'])
29
31
    format_num = '7'
30
32
 
31
 
    def _unpack_entry(self, elt, entry_cache=None, return_from_cache=False):
32
 
        kind = elt.tag
33
 
        if not kind in self.supported_kinds:
34
 
            raise AssertionError('unsupported entry kind %s' % kind)
35
 
        if kind == 'tree-reference':
36
 
            file_id = elt.attrib['file_id']
37
 
            name = elt.attrib['name']
38
 
            parent_id = elt.attrib['parent_id']
39
 
            revision = elt.get('revision')
40
 
            reference_revision = elt.get('reference_revision')
41
 
            return inventory.TreeReference(file_id, name, parent_id, revision,
42
 
                                           reference_revision)
43
 
        else:
44
 
            return xml6.Serializer_v6._unpack_entry(self, elt,
45
 
                entry_cache=entry_cache, return_from_cache=return_from_cache)
46
33
 
47
34
serializer_v7 = Serializer_v7()