@@ -49,7 +49,7 @@ def _getChildNodes(self):
4949def testSerializer (element ):
5050rv = []
5151finalText = None
52- filter = ihatexml .InfosetFilter ()
52+ infosetFilter = ihatexml .InfosetFilter ()
5353def serializeElement (element ,indent = 0 ):
5454if not hasattr (element ,"tag" ):
5555if hasattr (element ,"getroot" ):
@@ -90,22 +90,22 @@ def serializeElement(element, indent=0):
9090tag = nsmatch .group (2 )
9191prefix = constants .prefixes [ns ]
9292rv .append ("|%s<%s %s>" % (' ' * indent ,prefix ,
93- filter .fromXmlName (tag )))
93+ infosetFilter .fromXmlName (tag )))
9494else :
9595rv .append ("|%s<%s>" % (' ' * indent ,
96- filter .fromXmlName (element .tag )))
96+ infosetFilter .fromXmlName (element .tag )))
9797
9898if hasattr (element ,"attrib" ):
9999attributes = []
100100for name ,value in element .attrib .items ():
101101nsmatch = tag_regexp .match (name )
102102if nsmatch is not None :
103103ns ,name = nsmatch .groups ()
104- name = filter .fromXmlName (name )
104+ name = infosetFilter .fromXmlName (name )
105105prefix = constants .prefixes [ns ]
106106attr_string = "%s %s" % (prefix ,name )
107107else :
108- attr_string = filter .fromXmlName (name )
108+ attr_string = infosetFilter .fromXmlName (name )
109109attributes .append ((attr_string ,value ))
110110
111111for name ,value in sorted (attributes ):
@@ -178,7 +178,7 @@ class TreeBuilder(_base.TreeBuilder):
178178
179179def __init__ (self ,namespaceHTMLElements ,fullTree = False ):
180180builder = etree_builders .getETreeModule (etree ,fullTree = fullTree )
181- filter = self .filter = ihatexml .InfosetFilter ()
181+ infosetFilter = self .infosetFilter = ihatexml .InfosetFilter ()
182182self .namespaceHTMLElements = namespaceHTMLElements
183183
184184class Attributes (dict ):
@@ -187,32 +187,32 @@ def __init__(self, element, value={}):
187187dict .__init__ (self ,value )
188188for key ,value in self .items ():
189189if isinstance (key ,tuple ):
190- name = "{%s}%s" % (key [2 ],filter .coerceAttribute (key [1 ]))
190+ name = "{%s}%s" % (key [2 ],infosetFilter .coerceAttribute (key [1 ]))
191191else :
192- name = filter .coerceAttribute (key )
192+ name = infosetFilter .coerceAttribute (key )
193193self ._element ._element .attrib [name ]= value
194194
195195def __setitem__ (self ,key ,value ):
196196dict .__setitem__ (self ,key ,value )
197197if isinstance (key ,tuple ):
198- name = "{%s}%s" % (key [2 ],filter .coerceAttribute (key [1 ]))
198+ name = "{%s}%s" % (key [2 ],infosetFilter .coerceAttribute (key [1 ]))
199199else :
200- name = filter .coerceAttribute (key )
200+ name = infosetFilter .coerceAttribute (key )
201201self ._element ._element .attrib [name ]= value
202202
203203class Element (builder .Element ):
204204def __init__ (self ,name ,namespace ):
205- name = filter .coerceElement (name )
205+ name = infosetFilter .coerceElement (name )
206206builder .Element .__init__ (self ,name ,namespace = namespace )
207207self ._attributes = Attributes (self )
208208
209209def _setName (self ,name ):
210- self ._name = filter .coerceElement (name )
210+ self ._name = infosetFilter .coerceElement (name )
211211self ._element .tag = self ._getETreeTag (
212212self ._name ,self ._namespace )
213213
214214def _getName (self ):
215- return filter .fromXmlName (self ._name )
215+ return infosetFilter .fromXmlName (self ._name )
216216
217217name = property (_getName ,_setName )
218218
@@ -225,7 +225,7 @@ def _setAttributes(self, attributes):
225225attributes = property (_getAttributes ,_setAttributes )
226226
227227def insertText (self ,data ,insertBefore = None ):
228- data = filter .coerceCharacters (data )
228+ data = infosetFilter .coerceCharacters (data )
229229builder .Element .insertText (self ,data ,insertBefore )
230230
231231def appendChild (self ,child ):
@@ -234,11 +234,11 @@ def appendChild(self, child):
234234
235235class Comment (builder .Comment ):
236236def __init__ (self ,data ):
237- data = filter .coerceComment (data )
237+ data = infosetFilter .coerceComment (data )
238238builder .Comment .__init__ (self ,data )
239239
240240def _setData (self ,data ):
241- data = filter .coerceComment (data )
241+ data = infosetFilter .coerceComment (data )
242242self ._element .text = data
243243
244244def _getData (self ):