← 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-03-06 20:42:40 UTC
  • mto: This revision was merged to the branch mainline in revision 4088.
  • Revision ID: john@arbash-meinel.com-20090306204240-mzjavv31z3gu1x7i
Fix a small bug in setup.py when an extension fails to build

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml4.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from bzrlib.xml_serializer import (
18
 
    Element,
19
 
    ElementTree,
20
 
    SubElement,
21
 
    XMLSerializer,
22
 
    escape_invalid_chars,
23
 
    )
 
17
from bzrlib.xml_serializer import ElementTree, SubElement, Element, Serializer
24
18
from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry
25
19
import bzrlib.inventory as inventory
26
20
from bzrlib.revision import Revision
27
21
from bzrlib.errors import BzrError
28
22
 
29
23
 
30
 
class _Serializer_v4(XMLSerializer):
 
24
class _Serializer_v4(Serializer):
31
25
    """Version 0.0.4 serializer
32
26
 
33
27
    You should use the serializer_v4 singleton.
63
57
        return e
64
58
 
65
59
 
66
 
    def _unpack_inventory(self, elt, revision_id=None, entry_cache=None,
67
 
                          return_from_cache=False):
 
60
    def _unpack_inventory(self, elt, revision_id=None, entry_cache=None):
68
61
        """Construct from XML Element
69
62
 
70
63
        :param revision_id: Ignored parameter used by xml5.
72
65
        root_id = elt.get('file_id') or ROOT_ID
73
66
        inv = Inventory(root_id)
74
67
        for e in elt:
75
 
            ie = self._unpack_entry(e, entry_cache=entry_cache,
76
 
                                    return_from_cache=return_from_cache)
 
68
            ie = self._unpack_entry(e, entry_cache=entry_cache)
77
69
            if ie.parent_id == ROOT_ID:
78
70
                ie.parent_id = root_id
79
71
            inv.add(ie)
80
72
        return inv
81
73
 
82
74
 
83
 
    def _unpack_entry(self, elt, entry_cache=None, return_from_cache=False):
 
75
    def _unpack_entry(self, elt, entry_cache=None):
84
76
        ## original format inventories don't have a parent_id for
85
77
        ## nodes in the root directory, but it's cleaner to use one
86
78
        ## internally.
128
120
        root.text = '\n'
129
121
 
130
122
        msg = SubElement(root, 'message')
131
 
        msg.text = escape_invalid_chars(rev.message)[0]
 
123
        msg.text = rev.message
132
124
        msg.tail = '\n'
133
125
 
134
126
        if rev.parents: