← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml_serializer.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-02 05:45:50 UTC
  • mto: This revision was merged to the branch mainline in revision 1851.
  • Revision ID: john@arbash-meinel.com-20060702054550-e535f24da694acb7
make_entry refuses to create non-normalized entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
1
 
#! /usr/bin/env python
2
1
# -*- coding: UTF-8 -*-
3
2
 
4
3
# This program is free software; you can redistribute it and/or modify
28
27
try:
29
28
    from cElementTree import (ElementTree, SubElement, Element,
30
29
                              XMLTreeBuilder, fromstring, tostring)
 
30
    import elementtree
31
31
except ImportError:
32
 
    ## from warnings import warn
33
 
    ## warn('using slower ElementTree; consider installing cElementTree')
 
32
    mutter('WARNING: using slower ElementTree; consider installing cElementTree'
 
33
           " and make sure it's on your PYTHONPATH")
34
34
    from util.elementtree.ElementTree import (ElementTree, SubElement,
35
35
                                              Element, XMLTreeBuilder,
36
36
                                              fromstring, tostring)
 
37
    import util.elementtree as elementtree
37
38
 
38
39
from bzrlib.errors import BzrError
39
40
 
46
47
        self._write_element(elt, f)
47
48
 
48
49
    def write_inventory_to_string(self, inv):
49
 
        return tostring(self._pack_inventory(inv))
 
50
        return tostring(self._pack_inventory(inv)) + '\n'
50
51
 
51
52
    def read_inventory_from_string(self, xml_string):
52
53
        return self._unpack_inventory(fromstring(xml_string))
58
59
        self._write_element(self._pack_revision(rev), f)
59
60
 
60
61
    def write_revision_to_string(self, rev):
61
 
        return tostring(self._pack_revision(rev), f)
 
62
        return tostring(self._pack_revision(rev)) + '\n'
62
63
 
63
64
    def read_revision(self, f):
64
65
        return self._unpack_revision(self._read_element(f))
72
73
 
73
74
    def _read_element(self, f):
74
75
        return ElementTree().parse(f)
 
76
 
 
77
 
 
78
# performance tuning for elementree's serialiser. This should be
 
79
# sent upstream - RBC 20060523.
 
80
# the functions here are patched into elementtree at runtime.
 
81
import re
 
82
escape_re = re.compile("[&'\"<>]")
 
83
escape_map = {
 
84
    "&":'&amp;',
 
85
    "'":"&apos;", # FIXME: overkill
 
86
    "\"":"&quot;",
 
87
    "<":"&lt;",
 
88
    ">":"&gt;",
 
89
    }
 
90
def _escape_replace(match, map=escape_map):
 
91
    return map[match.group()]
 
92
 
 
93
def _escape_attrib(text, encoding=None, replace=None):
 
94
    # escape attribute value
 
95
    try:
 
96
        if encoding:
 
97
            try:
 
98
                text = elementtree.ElementTree._encode(text, encoding)
 
99
            except UnicodeError:
 
100
                return elementtree.ElementTree._encode_entity(text)
 
101
        if replace is None:
 
102
            return escape_re.sub(_escape_replace, text)
 
103
        else:
 
104
            text = replace(text, "&", "&amp;")
 
105
            text = replace(text, "'", "&apos;") # FIXME: overkill
 
106
            text = replace(text, "\"", "&quot;")
 
107
            text = replace(text, "<", "&lt;")
 
108
            text = replace(text, ">", "&gt;")
 
109
            return text
 
110
    except (TypeError, AttributeError):
 
111
        elementtree.ElementTree._raise_serialization_error(text)
 
112
 
 
113
elementtree.ElementTree._escape_attrib = _escape_attrib
 
114
 
 
115
escape_cdata_re = re.compile("[&<>]")
 
116
escape_cdata_map = {
 
117
    "&":'&amp;',
 
118
    "<":"&lt;",
 
119
    ">":"&gt;",
 
120
    }
 
121
def _escape_cdata_replace(match, map=escape_cdata_map):
 
122
    return map[match.group()]
 
123
 
 
124
def _escape_cdata(text, encoding=None, replace=None):
 
125
    # escape character data
 
126
    try:
 
127
        if encoding:
 
128
            try:
 
129
                text = elementtree.ElementTree._encode(text, encoding)
 
130
            except UnicodeError:
 
131
                return elementtree.ElementTree._encode_entity(text)
 
132
        if replace is None:
 
133
            return escape_cdata_re.sub(_escape_cdata_replace, text)
 
134
        else:
 
135
            text = replace(text, "&", "&amp;")
 
136
            text = replace(text, "<", "&lt;")
 
137
            text = replace(text, ">", "&gt;")
 
138
            return text
 
139
    except (TypeError, AttributeError):
 
140
        elementtree.ElementTree._raise_serialization_error(text)
 
141
 
 
142
elementtree.ElementTree._escape_cdata = _escape_cdata