~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/xml4.py

  • Committer: Vincent Ladeuil
  • Date: 2016-01-21 09:52:36 UTC
  • mto: This revision was merged to the branch mainline in revision 6611.
  • Revision ID: v.ladeuil+lp@free.fr-20160121095236-iandk0fic0phu9ey
Fix the failing gpg test on wily.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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.xml_serializer import (
18
20
    Element,
19
 
    ElementTree,
20
21
    SubElement,
21
22
    XMLSerializer,
22
23
    escape_invalid_chars,
23
24
    )
24
 
from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry
 
25
from bzrlib.inventory import ROOT_ID, Inventory
25
26
import bzrlib.inventory as inventory
26
27
from bzrlib.revision import Revision
27
28
from bzrlib.errors import BzrError