fixed a clean code movement error: forget to apply remove tags when

text does not contains cdata

--HG--
extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40175
This commit is contained in:
olveyra 2008-08-20 12:52:31 +00:00
parent 1c8c73ebfa
commit 643ea99f36
1 changed files with 4 additions and 2 deletions

View File

@ -30,7 +30,7 @@ class ExtendedAdaptor(BaseAdaptor):
class ExtractAdaptor(ExtendedAdaptor):
def function(self, item, location, **pipeargs):
def function(self, attrname, location, **pipeargs):
return self.do(self.extract, location, **pipeargs)
def extract(self, location, **kwargs):
@ -75,7 +75,7 @@ _xml_cdata_split_re = re.compile('(<!\[CDATA\[.*?\]\]>)', re.S)
class HtmlCleanAdaptor(ExtendedAdaptor):
def function(self, item, location, **pipeargs):
def function(self, attrname, string, **pipeargs):
return self.do(self.clean, string, **pipeargs)
def clean(self, string, **kwargs):
@ -121,4 +121,6 @@ class XmlCleanAdaptor(HtmlCleanAdaptor):
pieces.append(HtmlCleanAdaptor._remove_tags(self, piece, **kwargs))
xml = "".join(pieces)
else:
xml = HtmlCleanAdaptor._remove_tags(self, xml, **kwargs)
return xml