/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: Andrew Bennetts
  • Date: 2009-06-17 02:02:44 UTC
  • mfrom: (4449 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4452.
  • Revision ID: andrew.bennetts@canonical.com-20090617020244-50aantdf95aakvjx
Merge bzr.dev, resolving NEWS conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
52
52
class XMLSerializer(Serializer):
53
53
    """Abstract XML object serialize/deserialize"""
54
54
 
 
55
    squashes_xml_invalid_characters = True
 
56
 
55
57
    def read_inventory_from_string(self, xml_string, revision_id=None,
56
58
                                   entry_cache=None):
57
59
        """Read xml_string into an inventory object.
172
174
    """Escape the XML-invalid characters in a commit message.
173
175
 
174
176
    :param message: Commit message to escape
175
 
    :param count: Number of characters that were escaped
 
177
    :return: tuple with escaped message and number of characters escaped
176
178
    """
 
179
    if message is None:
 
180
        return None, 0
177
181
    # Python strings can include characters that can't be
178
182
    # represented in well-formed XML; escape characters that
179
183
    # aren't listed in the XML specification