← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml_serializer.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-30 14:30:10 UTC
  • mfrom: (6615.3.7 merges)
  • mto: This revision was merged to the branch mainline in revision 6621.
  • Revision ID: v.ladeuil+lp@free.fr-20170130143010-p31t1ranfeqbaeki
Merge  2.7 into trunk including fix for bug #1657238

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