← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml4.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml4.py
25
25
    """Version 0.0.4 serializer
26
26
 
27
27
    You should use the serializer_v4 singleton.
28
 
    
 
28
 
29
29
    v4 serialisation is no longer supported, only deserialisation.
30
30
    """
31
 
    
 
31
 
32
32
    __slots__ = []
33
 
    
 
33
 
34
34
    def _pack_entry(self, ie):
35
35
        """Convert InventoryEntry to XML element"""
36
36
        e = Element('entry')
134
134
                    p.set('revision_sha1', rev.parent_sha1s[i])
135
135
        return root
136
136
 
137
 
    
 
137
 
138
138
    def _unpack_revision(self, elt):
139
139
        """XML Element -> Revision object"""
140
 
        
 
140
 
141
141
        # <changeset> is deprecated...
142
142
        if elt.tag not in ('revision', 'changeset'):
143
143
            raise BzrError("unexpected tag in revision file: %r" % elt)