← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml_serializer.py

  • Committer: Patch Queue Manager
  • Date: 2014-04-09 13:36:25 UTC
  • mfrom: (6592.1.2 1303879-py27-issues)
  • Revision ID: pqm@pqm.ubuntu.com-20140409133625-s24spv3kha2w2860
(vila) Fix python-2.7.6 test failures. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
30
30
    import xml.etree.cElementTree as elementtree
31
31
    ParseError = getattr(elementtree, "ParseError", SyntaxError)
32
32
except ImportError:
33
 
    # Fall back to pure python implementation if C extention is unavailable
 
33
    # Fall back to pure python implementation if C extension is unavailable
34
34
    import xml.etree.ElementTree as elementtree
35
35
    try:
36
36
        from xml.etree.ElementTree import ParseError
309
309
                                     elt_get('name'),
310
310
                                     parent_id)
311
311
        ie.symlink_target = elt_get('symlink_target')
 
312
    elif kind == 'tree-reference':
 
313
        file_id = elt.attrib['file_id']
 
314
        name = elt.attrib['name']
 
315
        parent_id = elt.attrib['parent_id']
 
316
        revision = elt.get('revision')
 
317
        reference_revision = elt.get('reference_revision')
 
318
        ie = inventory.TreeReference(file_id, name, parent_id, revision,
 
319
                                       reference_revision)
312
320
    else:
313
321
        raise errors.UnsupportedInventoryKind(kind)
314
322
    ie.revision = revision