← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml5.py

  • Committer: John Arbash Meinel
  • Date: 2006-06-18 02:21:57 UTC
  • mfrom: (1787 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1794.
  • Revision ID: john@arbash-meinel.com-20060618022157-6e33aa9b67c25e4f
[merge] bzr.dev 1787

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml5.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
2
 
#
3
1
# This program is free software; you can redistribute it and/or modify
4
2
# it under the terms of the GNU General Public License as published by
5
3
# the Free Software Foundation; either version 2 of the License, or
15
13
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
14
 
17
15
 
18
 
from bzrlib.xml_serializer import SubElement, Element, Serializer
 
16
from bzrlib.xml_serializer import ElementTree, SubElement, Element, Serializer
19
17
from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry
20
18
import bzrlib.inventory as inventory
21
 
from bzrlib.revision import Revision
 
19
from bzrlib.revision import Revision        
22
20
from bzrlib.errors import BzrError
23
21
 
24
22
 
199
197
            return
200
198
        for prop_elt in props_elt:
201
199
            assert prop_elt.tag == 'property', \
202
 
                "bad tag under properties list: %r" % prop_elt.tag
 
200
                "bad tag under properties list: %r" % p.tag
203
201
            name = prop_elt.get('name')
204
202
            value = prop_elt.text
205
203
            assert name not in rev.properties, \
206
 
                "repeated property %r" % name
 
204
                "repeated property %r" % p.name
207
205
            rev.properties[name] = value
208
206
 
209
207