← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml.py

  • Committer: Martin Pool
  • Date: 2005-10-04 11:13:33 UTC
  • mto: (1185.13.3)
  • mto: This revision was merged to the branch mainline in revision 1403.
  • Revision ID: mbp@sourcefrog.net-20051004111332-f7b8a6bd41b9fe22
- tweak capture_tree formatting

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml.py
 
1
#! /usr/bin/env python
1
2
# -*- coding: UTF-8 -*-
2
 
#
 
3
 
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
5
6
# the Free Software Foundation; either version 2 of the License, or
6
7
# (at your option) any later version.
7
 
#
 
8
 
8
9
# This program is distributed in the hope that it will be useful,
9
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
12
# GNU General Public License for more details.
12
 
#
 
13
 
13
14
# You should have received a copy of the GNU General Public License
14
15
# along with this program; if not, write to the Free Software
15
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
27
28
try:
28
29
    from cElementTree import (ElementTree, SubElement, Element,
29
30
                              XMLTreeBuilder, fromstring, tostring)
30
 
    import elementtree
31
31
except ImportError:
32
 
    mutter('WARNING: using slower ElementTree; consider installing cElementTree'
33
 
           " and make sure it's on your PYTHONPATH")
 
32
    ## from warnings import warn
 
33
    ## warn('using slower ElementTree; consider installing cElementTree')
34
34
    from util.elementtree.ElementTree import (ElementTree, SubElement,
35
35
                                              Element, XMLTreeBuilder,
36
36
                                              fromstring, tostring)
37
 
    import util.elementtree as elementtree
38
37
 
39
38
from bzrlib.errors import BzrError
40
39
 
47
46
        self._write_element(elt, f)
48
47
 
49
48
    def write_inventory_to_string(self, inv):
50
 
        return tostring(self._pack_inventory(inv)) + '\n'
 
49
        return tostring(self._pack_inventory(inv))
51
50
 
52
51
    def read_inventory_from_string(self, xml_string):
53
52
        return self._unpack_inventory(fromstring(xml_string))
59
58
        self._write_element(self._pack_revision(rev), f)
60
59
 
61
60
    def write_revision_to_string(self, rev):
62
 
        return tostring(self._pack_revision(rev)) + '\n'
 
61
        return tostring(self._pack_revision(rev), f)
63
62
 
64
63
    def read_revision(self, f):
65
64
        return self._unpack_revision(self._read_element(f))
73
72
 
74
73
    def _read_element(self, f):
75
74
        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