/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/xml_serializer.py

  • Committer: Jelmer Vernooij
  • Date: 2009-04-03 21:50:40 UTC
  • mto: This revision was merged to the branch mainline in revision 4253.
  • Revision ID: jelmer@samba.org-20090403215040-lz70cjc4i8bfg9xd
Review from Aaron: 
- move generic serializer tests to bzrlib.tests.test_serializer.
- fix some formatting
- add NEWS item

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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
23
23
# ElementTree bits
24
24
 
25
25
from bzrlib.serializer import Serializer
26
 
from bzrlib.trace import mutter
 
26
from bzrlib.trace import mutter, warning
27
27
 
28
28
try:
29
29
    try:
52
52
class XMLSerializer(Serializer):
53
53
    """Abstract XML object serialize/deserialize"""
54
54
 
55
 
    squashes_xml_invalid_characters = True
56
 
 
57
55
    def read_inventory_from_string(self, xml_string, revision_id=None,
58
 
                                   entry_cache=None, return_from_cache=False):
 
56
                                   entry_cache=None):
59
57
        """Read xml_string into an inventory object.
60
58
 
61
59
        :param xml_string: The xml to read.
69
67
        :param entry_cache: An optional cache of InventoryEntry objects. If
70
68
            supplied we will look up entries via (file_id, revision_id) which
71
69
            should map to a valid InventoryEntry (File/Directory/etc) object.
72
 
        :param return_from_cache: Return entries directly from the cache,
73
 
            rather than copying them first. This is only safe if the caller
74
 
            promises not to mutate the returned inventory entries, but it can
75
 
            make some operations significantly faster.
76
70
        """
77
71
        try:
78
72
            return self._unpack_inventory(fromstring(xml_string), revision_id,
79
 
                                          entry_cache=entry_cache,
80
 
                                          return_from_cache=return_from_cache)
 
73
                                          entry_cache=entry_cache)
81
74
        except ParseError, e:
82
75
            raise errors.UnexpectedInventoryFormat(e)
83
76
 
84
77
    def read_inventory(self, f, revision_id=None):
85
78
        try:
86
 
            try:
87
 
                return self._unpack_inventory(self._read_element(f),
88
 
                    revision_id=None)
89
 
            finally:
90
 
                f.close()
 
79
            return self._unpack_inventory(self._read_element(f),
 
80
                revision_id=None)
91
81
        except ParseError, e:
92
82
            raise errors.UnexpectedInventoryFormat(e)
93
83
 
176
166
        elementtree.ElementTree._raise_serialization_error(text)
177
167
 
178
168
elementtree.ElementTree._escape_cdata = _escape_cdata
179
 
 
180
 
 
181
 
def escape_invalid_chars(message):
182
 
    """Escape the XML-invalid characters in a commit message.
183
 
 
184
 
    :param message: Commit message to escape
185
 
    :return: tuple with escaped message and number of characters escaped
186
 
    """
187
 
    if message is None:
188
 
        return None, 0
189
 
    # Python strings can include characters that can't be
190
 
    # represented in well-formed XML; escape characters that
191
 
    # aren't listed in the XML specification
192
 
    # (http://www.w3.org/TR/REC-xml/#NT-Char).
193
 
    return re.subn(u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
194
 
            lambda match: match.group(0).encode('unicode_escape'),
195
 
            message)